From d9b8a8d197c076a373ece871f3953de0d2a385a8 Mon Sep 17 00:00:00 2001 From: ChengHao Yang <17496418+tico88612@users.noreply.github.com> Date: Tue, 31 Mar 2026 09:49:09 +0800 Subject: [PATCH] Add TestCLIStatus to integration tests and fix assertions (#1368) - TestCLIStatus isn't in the integration test. - Update the output to align with the current output. - Follow up #1193 --------- Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> --- Makefile | 1 + Tests/CLITests/Subcommands/System/TestCLIStatus.swift | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8ace4aff..cbfb923d 100644 --- a/Makefile +++ b/Makefile @@ -193,6 +193,7 @@ integration: init-block { \ exit_code=0; \ CLITEST_LOG_ROOT=$(LOG_ROOT) && export CLITEST_LOG_ROOT ; \ + $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIStatus || exit_code=1 ; \ $(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 ; \ diff --git a/Tests/CLITests/Subcommands/System/TestCLIStatus.swift b/Tests/CLITests/Subcommands/System/TestCLIStatus.swift index 47ee1767..262a900d 100644 --- a/Tests/CLITests/Subcommands/System/TestCLIStatus.swift +++ b/Tests/CLITests/Subcommands/System/TestCLIStatus.swift @@ -52,10 +52,10 @@ final class TestCLIStatus: CLITest { let fullOutput = lines.joined(separator: "\n") #expect(fullOutput.contains("status")) #expect(fullOutput.contains("running")) - #expect(fullOutput.contains("app-root")) - #expect(fullOutput.contains("install-root")) - #expect(fullOutput.contains("apiserver-version")) - #expect(fullOutput.contains("apiserver-commit")) + #expect(fullOutput.contains("appRoot")) + #expect(fullOutput.contains("installRoot")) + #expect(fullOutput.contains("apiserver.version")) + #expect(fullOutput.contains("apiserver.commit")) _ = data // silence unused warning if assertions short-circuit }