From d0fc93e7d3b4e859f9020d167936177ced2e621a Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Fri, 26 Sep 2025 13:27:26 -0400 Subject: [PATCH 1/3] log actual output channel messages on failure --- .../integration-tests/tasks/SwiftPluginTaskProvider.test.ts | 6 +++++- test/integration-tests/ui/ProjectPanelProvider.test.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/integration-tests/tasks/SwiftPluginTaskProvider.test.ts b/test/integration-tests/tasks/SwiftPluginTaskProvider.test.ts index 743f52c39..fba67001b 100644 --- a/test/integration-tests/tasks/SwiftPluginTaskProvider.test.ts +++ b/test/integration-tests/tasks/SwiftPluginTaskProvider.test.ts @@ -45,7 +45,11 @@ tag("medium").suite("SwiftPluginTaskProvider Test Suite", function () { folderContext = await folderInRootWorkspace("command-plugin", workspaceContext); const logger = await ctx.loggerFactory.temp("SwiftPluginTaskProvider.tests"); await folderContext.loadSwiftPlugins(logger); - expect(logger.logs.length).to.equal(0, `Expected no output channel logs`); + if (logger.logs.length > 0) { + expect.fail( + `Expected no output channel logs: ${JSON.stringify(logger.logs, undefined, 2)}` + ); + } expect(workspaceContext.folders).to.not.have.lengthOf(0); }, }); diff --git a/test/integration-tests/ui/ProjectPanelProvider.test.ts b/test/integration-tests/ui/ProjectPanelProvider.test.ts index c8a0cfd0d..e2aa64c2a 100644 --- a/test/integration-tests/ui/ProjectPanelProvider.test.ts +++ b/test/integration-tests/ui/ProjectPanelProvider.test.ts @@ -50,7 +50,11 @@ tag("medium").suite("ProjectPanelProvider Test Suite", function () { ); const logger = await ctx.loggerFactory.temp("ProjectPanelProvider.tests"); await folderContext.loadSwiftPlugins(logger); - expect(logger.logs.length).to.equal(0, `Expected no output channel logs`); + if (logger.logs.length > 0) { + expect.fail( + `Expected no output channel logs: ${JSON.stringify(logger.logs, undefined, 2)}` + ); + } treeProvider = new ProjectPanelProvider(workspaceContext); await workspaceContext.focusFolder(folderContext); const buildAllTask = await createBuildAllTask(folderContext); From 60b32053fb17ad69cc94918369e3e4868b95f8b9 Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Mon, 29 Sep 2025 10:21:50 -0400 Subject: [PATCH 2/3] use a special SwiftPM cache path for tests --- .gitignore | 3 +++ assets/test/.vscode/settings.json | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 68cf1e8bb..7359c49c9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ coverage test-results userdocs/userdocs.docc/.docc-build +# SwiftPM cache for tests +.spm-cache + # Generated Assets assets/documentation-webview assets/icons diff --git a/assets/test/.vscode/settings.json b/assets/test/.vscode/settings.json index 3962271c2..0e3ac8204 100644 --- a/assets/test/.vscode/settings.json +++ b/assets/test/.vscode/settings.json @@ -2,7 +2,7 @@ "swift.disableAutoResolve": true, "swift.autoGenerateLaunchConfigurations": false, "swift.debugger.debugAdapter": "lldb-dap", - "swift.debugger.setupCodeLLDB": "alwaysUpdateGlobal", + "swift.debugger.setupCodeLLDB": "never", "swift.additionalTestArguments": [ "-Xswiftc", "-DTEST_ARGUMENT_SET_VIA_TEST_BUILD_ARGUMENTS_SETTING" @@ -13,5 +13,8 @@ "swift.sourcekit-lsp.backgroundIndexing": "off", "swift.excludePathsFromActivation": { "**/excluded": true - } + }, + "swift.packageArguments": [ + "--cache-path=${workspaceFolder}/.spm-cache" + ] } \ No newline at end of file From 4603060b7c49a6e5a7b0cb8bd9ba8d79c4cb2ef3 Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Mon, 29 Sep 2025 11:43:38 -0400 Subject: [PATCH 3/3] use swift-markdown 0.7.1 instead of main --- assets/test/dependencies/Package.swift | 2 +- assets/test/targets/Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/test/dependencies/Package.swift b/assets/test/dependencies/Package.swift index ba5acdb59..2258a6c68 100644 --- a/assets/test/dependencies/Package.swift +++ b/assets/test/dependencies/Package.swift @@ -6,7 +6,7 @@ import PackageDescription let package = Package( name: "dependencies", dependencies: [ - .package(url: "https://github.com/swiftlang/swift-markdown.git", branch: "main"), + .package(url: "https://github.com/swiftlang/swift-markdown.git", from: "0.7.1"), .package(path: "../defaultPackage"), ], targets: [ diff --git a/assets/test/targets/Package.swift b/assets/test/targets/Package.swift index 1e67f25b1..56c570470 100644 --- a/assets/test/targets/Package.swift +++ b/assets/test/targets/Package.swift @@ -20,7 +20,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/swiftlang/swift-markdown.git", branch: "main"), + .package(url: "https://github.com/swiftlang/swift-markdown.git", from: "0.7.1"), .package(path: "../defaultPackage"), ], targets: [