Merge artifacts for new structure

Author: dsherret

lib/test-results-downloader.test.ts

@@ -376,6 +376,72 @@ Deno.test("download multiple artifacts in parallel", async () => {
   );
 });
 
+Deno.test("merge split artifacts by job", async () => {
+  const mockClient = new MockGitHubApiClient();
+  const mockParser = new MockArtifactParser();
+  const mockStore = new MockTestResultArtifactStore();
+
+  const downloader = new RealTestResultsDownloader(
+    mockParser,
+    mockClient,
+    mockStore,
+  );
+
+  // setup artifacts split by suite (new naming convention)
+  const artifacts = [
+    createMockArtifact(
+      1,
+      "test-results-linux-x86_64-debug-integration.json",
+      "https://example.com/1.zip",
+    ),
+    createMockArtifact(
+      2,
+      "test-results-linux-x86_64-debug-unit.json",
+      "https://example.com/2.zip",
+    ),
+    createMockArtifact(
+      3,
+      "test-results-macos-aarch64-debug-specs.json",
+      "https://example.com/3.zip",
+    ),
+  ];
+
+  mockClient.mockArtifacts(444, artifacts);
+  for (let i = 1; i <= 3; i++) {
+    mockClient.mockBlob(`https://example.com/${i}.zip`, new Blob([`test${i}`]));
+  }
+
+  mockParser.mockParseResult(
+    "test-results-linux-x86_64-debug-integration.json",
+    {
+      name: "linux-x86_64-debug-integration",
+      tests: [{ name: "int_test", path: "test/int.ts", duration: 100 }],
+    },
+  );
+  mockParser.mockParseResult("test-results-linux-x86_64-debug-unit.json", {
+    name: "linux-x86_64-debug-unit",
+    tests: [{ name: "unit_test", path: "test/unit.ts", duration: 50 }],
+  });
+  mockParser.mockParseResult(
+    "test-results-macos-aarch64-debug-specs.json",
+    {
+      name: "macos-aarch64-debug-specs",
+      tests: [{ name: "spec_test", path: "test/spec.ts", duration: 200 }],
+    },
+  );
+
+  const results = await downloader.downloadForRunId(444);
+
+  // linux-x86_64-debug artifacts should be merged into one
+  assertEquals(results.length, 2);
+  assertEquals(results[0].name, "linux-x86_64-debug");
+  assertEquals(results[0].tests.length, 2);
+  assertEquals(results[0].tests[0].name, "int_test");
+  assertEquals(results[0].tests[1].name, "unit_test");
+  assertEquals(results[1].name, "macos-aarch64-debug");
+  assertEquals(results[1].tests.length, 1);
+});
+
 Deno.test("store is shared across downloads", async () => {
   const mockClient = new MockGitHubApiClient();
   const mockParser = new MockArtifactParser();

lib/test-results-downloader.ts

@@ -68,7 +68,7 @@ export class RealTestResultsDownloader {
       matchingArtifacts.map((artifact) => this.#downloadArtifact(artifact)),
     );
 
-    return downloads;
+    return mergeArtifactsByJob(downloads);
   }
 
   #downloadArtifact(
@@ -87,3 +87,36 @@ export class RealTestResultsDownloader {
     return value.get();
   }
 }
+
+/**
+ * Merges artifacts that belong to the same job. Artifacts follow the naming
+ * pattern `{os}-{arch}-{build_type}-{suite}` (e.g. `linux-x86_64-debug-integration`).
+ * This groups by the first three segments (os-arch-build_type) and concatenates
+ * tests from each suite. Old-style names without suite segments are left as-is.
+ */
+function mergeArtifactsByJob(
+  artifacts: ParsedTestResultArtifact[],
+): ParsedTestResultArtifact[] {
+  const groups = new Map<string, RecordedTestResult[]>();
+  const groupOrder: string[] = [];
+
+  for (const artifact of artifacts) {
+    const parts = artifact.name.split("-");
+    // new-style: os-arch-build_type-suite (4+ segments)
+    // old-style: os (1 segment, e.g. "linux")
+    const key = parts.length >= 4 ? parts.slice(0, 3).join("-") : artifact.name;
+
+    const existing = groups.get(key);
+    if (existing) {
+      existing.push(...artifact.tests);
+    } else {
+      groupOrder.push(key);
+      groups.set(key, [...artifact.tests]);
+    }
+  }
+
+  return groupOrder.map((key) => ({
+    name: key,
+    tests: groups.get(key)!,
+  }));
+}