lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-23 08:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TestCLIVersion build-type check for release CI (#1627)

Browse Source 
Fix TestCLIVersion build-type check for release CI (#1627)
- Refer to https://github.com/apple/container/issues/1626
This commit is contained in:
Di Warachet S.
2026-06-02 11:02:38 -07:00
committed by GitHub
parent e20aca8203
commit 4c22305eda
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/CLITests/Subcommands/System/TestCLIVersion.swift
+9 -12
View File
@@ -36,15 +36,12 @@ final class TestCLIVersion: CLITest {
let server: VersionInfo?
}
private func expectedBuildType() throws -> String {
let path = try executablePath
if path.path.contains("/debug/") {
return "debug"
} else if path.path.contains("/release/") {
return "release"
}
// Fallback: prefer debug when ambiguous (matches SwiftPM default for tests)
private func expectedBuildType() -> String {
#if DEBUG
return "debug"
#else
return "release"
#endif
}
@Test func defaultDisplaysTable() throws {
@@ -60,7 +57,7 @@ final class TestCLIVersion: CLITest {
#expect(lines[1].hasPrefix("container"))
// Build should reflect the binary we are running (debug/release)
let expected = try expectedBuildType()
let expected = expectedBuildType()
#expect(lines.joined(separator: "\n").contains(" \(expected) "))
_ = data // silence unused warning if assertions short-circuit
}
@@ -75,7 +72,7 @@ final class TestCLIVersion: CLITest {
#expect(!decoded[0].version.isEmpty)
#expect(!decoded[0].commit.isEmpty)
let expected = try expectedBuildType()
let expected = expectedBuildType()
#expect(decoded[0].buildType == expected)
}
@@ -89,7 +86,7 @@ final class TestCLIVersion: CLITest {
#expect(!decoded[0].version.isEmpty)
#expect(!decoded[0].commit.isEmpty)
let expected = try expectedBuildType()
let expected = expectedBuildType()
#expect(decoded[0].buildType == expected)
}
@@ -110,7 +107,7 @@ final class TestCLIVersion: CLITest {
#expect(status == 0, "version --format json should succeed, stderr: \(err)")
let decoded = try JSONDecoder().decode([VersionOutput].self, from: data)
let expected = try expectedBuildType()
let expected = expectedBuildType()
#expect(decoded[0].buildType == expected, "Expected build type \(expected) but got \(decoded[0].buildType)")
}
}