Fix failing capture diagnostics test (#1769)

* Fix failing capture diagnostics test

* Ignore DAP logs prior to 6.0

* Also ignore LSP logs for earlier versions

Author: award999

test/integration-tests/commands/captureDiagnostics.test.ts

@@ -26,6 +26,7 @@ import {
     folderInRootWorkspace,
     updateSettings,
 } from "../utilities/testutilities";
+import { Version } from "../../../src/utilities/version";
 
 suite("captureDiagnostics Test Suite", () => {
     let workspaceContext: WorkspaceContext;
@@ -117,16 +118,20 @@ suite("captureDiagnostics Test Suite", () => {
 
             const { files, folder } = await decompressZip(zipPath as string);
 
+            const post60Logs = workspaceContext.globalToolchainSwiftVersion.isGreaterThanOrEqual(
+                new Version(6, 0, 0)
+            )
+                ? ["sourcekit-lsp/", "lldb-dap-session-123456789.log", "LLDB-DAP.log"]
+                : [];
+
             validate(
                 files.map(file => file.path),
                 [
                     "swift-vscode-extension.log",
-                    "defaultPackage-[a-z0-9]+-diagnostics.txt",
                     "defaultPackage-[a-z0-9]+-settings.txt",
-                    "lldb-dap-session-123456789.log",
-                    "sourcekit-lsp/",
-                    "LLDB-DAP.log",
-                ]
+                    ...post60Logs,
+                ],
+                false // Sometime are diagnostics, sometimes not but not point of this test
             );
 
             await rm(folder, { recursive: true, force: true });
@@ -142,21 +147,30 @@ suite("captureDiagnostics Test Suite", () => {
                 expect(zipPath).to.not.be.undefined;
 
                 const { files, folder } = await decompressZip(zipPath as string);
+
+                const post60Logs =
+                    workspaceContext.globalToolchainSwiftVersion.isGreaterThanOrEqual(
+                        new Version(6, 0, 0)
+                    )
+                        ? [
+                              "dependencies/sourcekit-lsp/",
+                              "LLDB-DAP.log",
+                              "lldb-dap-session-123456789.log",
+                              "defaultPackage/sourcekit-lsp/",
+                          ]
+                        : [];
+
                 validate(
                     files.map(file => file.path),
                     [
                         "swift-vscode-extension.log",
                         "defaultPackage/",
-                        "defaultPackage/defaultPackage-[a-z0-9]+-diagnostics.txt",
                         "defaultPackage/defaultPackage-[a-z0-9]+-settings.txt",
-                        "defaultPackage/sourcekit-lsp/",
                         "dependencies/",
-                        "dependencies/dependencies-[a-z0-9]+-diagnostics.txt",
                         "dependencies/dependencies-[a-z0-9]+-settings.txt",
-                        "dependencies/sourcekit-lsp/",
-                        "LLDB-DAP.log",
-                        "lldb-dap-session-123456789.log",
-                    ]
+                        ...post60Logs,
+                    ],
+                    false // Sometime are diagnostics, sometimes not but not point of this test
                 );
                 await rm(folder, { recursive: true, force: true });
             });
@@ -174,11 +188,13 @@ suite("captureDiagnostics Test Suite", () => {
         return { folder: tempDir, files: await decompress(zipPath as string, tempDir) };
     }
 
-    function validate(paths: string[], patterns: string[]): void {
-        expect(paths.length).to.equal(
-            patterns.length,
-            `Expected ${patterns.length} files: ${JSON.stringify(patterns)}\n\n...but found ${paths.length}: ${JSON.stringify(paths)}`
-        );
+    function validate(paths: string[], patterns: string[], matchCount: boolean = true): void {
+        if (matchCount) {
+            expect(paths.length).to.equal(
+                patterns.length,
+                `Expected ${patterns.length} files: ${JSON.stringify(patterns)}\n\n...but found ${paths.length}: ${JSON.stringify(paths)}`
+            );
+        }
         const regexes = patterns.map(pattern => new RegExp(`^${pattern}$`));
         for (const regex of regexes) {
             const matched = paths.some(path => regex.test(path));