Skip to content

Add TestCLIVersion to integration tests and fix assertions #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tico88612 wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −10
Open

Add TestCLIVersion to integration tests and fix assertions #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e9399d
Add the TestCLIVersion in intergration test
tico88612 Mar 14, 2026
cb82b1c
Fixed the TestCLIVersion failing test
tico88612 Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ integration: init-block
{ \
exit_code=0; \
CLITEST_LOG_ROOT=$(LOG_ROOT) && export CLITEST_LOG_ROOT ; \
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVersion || exit_code=1 ; \
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLINetwork || exit_code=1 ; \
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIRunLifecycle || exit_code=1 ; \
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIExecCommand || exit_code=1 ; \
Expand Down
18 changes: 8 additions & 10 deletions Tests/CLITests/Subcommands/System/TestCLIVersion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ final class TestCLIVersion: CLITest {
.components(separatedBy: .newlines)
#expect(lines.count >= 2) // header + at least CLI row
#expect(lines[0].contains("COMPONENT") && lines[0].contains("VERSION") && lines[0].contains("BUILD") && lines[0].contains("COMMIT"))
#expect(lines[1].hasPrefix("CLI "))
#expect(lines[1].hasPrefix("container"))

// Build should reflect the binary we are running (debug/release)
let expected = try expectedBuildType()
#expect(lines.joined(separator: "\n").contains(" CLI "))
#expect(lines.joined(separator: "\n").contains(" \(expected) "))
_ = data // silence unused warning if assertions short-circuit
}
Expand All @@ -69,13 +68,13 @@ final class TestCLIVersion: CLITest {
#expect(status == 0, "system version --format json should succeed, stderr: \(err)")
#expect(!out.isEmpty)

let decoded = try JSONDecoder().decode(VersionJSON.self, from: data)
#expect(decoded.appName == "container CLI")
#expect(!decoded.version.isEmpty)
#expect(!decoded.commit.isEmpty)
let decoded = try JSONDecoder().decode([VersionJSON].self, from: data)
#expect(decoded[0].appName == "container")
#expect(!decoded[0].version.isEmpty)
#expect(!decoded[0].commit.isEmpty)

let expected = try expectedBuildType()
#expect(decoded.buildType == expected)
#expect(decoded[0].buildType == expected)
}

@Test func explicitTableFormat() throws {
Expand All @@ -87,16 +86,15 @@ final class TestCLIVersion: CLITest {
.components(separatedBy: .newlines)
#expect(lines.count >= 2)
#expect(lines[0].contains("COMPONENT") && lines[0].contains("VERSION") && lines[0].contains("BUILD") && lines[0].contains("COMMIT"))
#expect(lines[1].hasPrefix("CLI "))
}

@Test func buildTypeMatchesBinary() throws {
// Validate build type via JSON to avoid parsing table text loosely
let (data, _, err, status) = try run(arguments: ["system", "version", "--format", "json"])
#expect(status == 0, "version --format json should succeed, stderr: \(err)")
let decoded = try JSONDecoder().decode(VersionJSON.self, from: data)
let decoded = try JSONDecoder().decode([VersionJSON].self, from: data)

let expected = try expectedBuildType()
#expect(decoded.buildType == expected, "Expected build type \(expected) but got \(decoded.buildType)")
#expect(decoded[0].buildType == expected, "Expected build type \(expected) but got \(decoded[0].buildType)")
}
}