Store test group information for retries (#16)

Author: yqiu24

javascript/dist/queue/BaseRunner.d.ts

@@ -329,10 +329,10 @@ export declare class BaseRunner {
     isExpired(): Promise<boolean>;
     maxTestsFailed(): Promise<boolean>;
     testFailedCount(): Promise<string | null>;
-    recordFailedTest(testName: string, testSuite: string): Promise<void>;
+    recordFailedTest(testName: string, testGroup: string, testSuite: string): Promise<void>;
     recordPassingTest(testName: string, testSuite: string): Promise<void>;
     getFailedTests(): Promise<string>;
-    getFailedTestNamesFromPreviousBuild(): Promise<string[]>;
+    getFailedTestGroupsFromPreviousBuild(): Promise<string[]>;
     waitForMaster(): Promise<void>;
     getMasterStatus(): Promise<string | null>;
     isInitialized(): Promise<boolean>;

javascript/dist/queue/BaseRunner.js

@@ -41,9 +41,9 @@ class BaseRunner {
     async testFailedCount() {
         return await this.client.get(this.key('test_failed_count'));
     }
-    async recordFailedTest(testName, testSuite) {
+    async recordFailedTest(testName, testGroup, testSuite) {
         const fullTestName = `${testName}:${testSuite}`;
-        const payload = JSON.stringify({ test_name: testName, test_suite: testSuite });
+        const payload = JSON.stringify({ test_name: testName, test_suite: testSuite, test_group: testGroup });
         await this.client.hSet(this.key('error-reports'), Buffer.from(fullTestName).toString('binary'), Buffer.from(payload).toString('binary'));
         await this.client.expire(this.key('error-reports'), this.config.redisTTL);
         console.log(`[ci-queue] Incrementing failed test count for ${testName}`);
@@ -58,14 +58,14 @@ class BaseRunner {
         const failures = Object.values(failedTests).map(test => JSON.parse(test));
         return JSON.stringify(failures);
     }
-    async getFailedTestNamesFromPreviousBuild() {
+    async getFailedTestGroupsFromPreviousBuild() {
         const previousBuildId = this.config.retriedBuildId;
         if (!previousBuildId) {
             return [];
         }
         const failedTests = await this.client.hGetAll(this.retriedBuildKey('error-reports'));
-        const failures = Object.values(failedTests).map(test => JSON.parse(test).test_name);
-        return failures;
+        const failedTestGroups = Object.values(failedTests).map(test => JSON.parse(test).test_group);
+        return failedTestGroups;
     }
     async waitForMaster() {
         if (this.isMaster) {

javascript/dist/queue/Worker.js

@@ -63,9 +63,9 @@ class Worker extends BaseRunner_1.BaseRunner {
     async populate(tests, seed) {
         if (this.config.retriedBuildId) {
             console.log(`[ci-queue] Retrying failed tests for build ${this.config.retriedBuildId}`);
-            const failedTests = await this.getFailedTestNamesFromPreviousBuild();
-            console.log(`[ci-queue] Failed tests: ${failedTests}`);
-            await this.push(failedTests);
+            const failedTestGroups = await this.getFailedTestGroupsFromPreviousBuild();
+            console.log(`[ci-queue] Failed test groups: ${failedTestGroups}`);
+            await this.push(failedTestGroups);
         }
         else {
             if (seed !== undefined) {

javascript/src/queue/BaseRunner.ts

@@ -50,9 +50,9 @@ export class BaseRunner {
     return await this.client.get(this.key('test_failed_count'));
   }
 
-  async recordFailedTest(testName: string, testSuite: string): Promise<void> {
+  async recordFailedTest(testName: string, testGroup: string, testSuite: string): Promise<void> {
     const fullTestName = `${testName}:${testSuite}`;
-    const payload = JSON.stringify({ test_name: testName, test_suite: testSuite });
+    const payload = JSON.stringify({ test_name: testName, test_suite: testSuite, test_group: testGroup });
     await this.client.hSet(
       this.key('error-reports'),
       Buffer.from(fullTestName).toString('binary'),
@@ -75,16 +75,16 @@ export class BaseRunner {
     return JSON.stringify(failures);
   }
 
-  async getFailedTestNamesFromPreviousBuild(): Promise<string[]> {
+  async getFailedTestGroupsFromPreviousBuild(): Promise<string[]> {
     const previousBuildId = this.config.retriedBuildId;
     if (!previousBuildId) {
       return [];
     }
 
     const failedTests = await this.client.hGetAll(this.retriedBuildKey('error-reports'));
-    const failures = Object.values(failedTests).map(test => JSON.parse(test).test_name);
+    const failedTestGroups = Object.values(failedTests).map(test => JSON.parse(test).test_group);
 
-    return failures;
+    return failedTestGroups;
   }
 
   async waitForMaster(): Promise<void> {

javascript/src/queue/Worker.ts

@@ -94,9 +94,9 @@ export class Worker extends BaseRunner {
   async populate(tests: string[], seed?: number) {
     if (this.config.retriedBuildId) {
       console.log(`[ci-queue] Retrying failed tests for build ${this.config.retriedBuildId}`);
-      const failedTests = await this.getFailedTestNamesFromPreviousBuild();
-      console.log(`[ci-queue] Failed tests: ${failedTests}`);
-      await this.push(failedTests);
+      const failedTestGroups = await this.getFailedTestGroupsFromPreviousBuild();
+      console.log(`[ci-queue] Failed test groups: ${failedTestGroups}`);
+      await this.push(failedTestGroups);
     } else {
       if (seed !== undefined) {
         tests = shuffleArray(tests, seed);