Return empty test groups on failure (#20)

Author: yqiu24

javascript/dist/queue/BaseRunner.js

@@ -63,10 +63,17 @@ class BaseRunner {
         if (!previousBuildId) {
             return [];
         }
-        const failedTests = await this.client.hGetAll(this.retriedBuildKey('error-reports'));
-        console.log(`[ci-queue] Failed tests`, failedTests);
-        const failedTestGroups = Object.values(failedTests).map(test => JSON.parse(test).test_group);
-        return failedTestGroups;
+        try {
+            const failedTests = await this.client.hGetAll(this.retriedBuildKey('error-reports'));
+            console.log(`[ci-queue] Failed tests`, failedTests);
+            const failedTestGroups = Object.values(failedTests).map(test => JSON.parse(test).test_group);
+            return failedTestGroups;
+        }
+        catch (e) {
+            // If the previous build is still in-progress, there may not be any failed tests
+            console.error('[ci-queue] Failed to get failed test groups from previous build', e);
+            return [];
+        }
     }
     async waitForMaster() {
         if (this.isMaster) {

javascript/dist/queue/Worker.js

@@ -63,18 +63,10 @@ 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}`);
-            try {
-                const failedTestGroups = await this.getFailedTestGroupsFromPreviousBuild();
-                console.log(`[ci-queue] Failed test groups: ${failedTestGroups}`);
-                await this.push(failedTestGroups);
-                return;
-            }
-            catch (e) {
-                // If the previous build is still in-progress, getFailedTestGroupsFromPreviousBuild will fail
-                // In this case, we want to continue processing the original tests
-                console.error('[ci-queue] Failed to get failed test groups from previous build', e);
-                console.log('[ci-queue] Continuing with original tests');
-            }
+            const failedTestGroups = await this.getFailedTestGroupsFromPreviousBuild();
+            console.log(`[ci-queue] Failed test groups: ${failedTestGroups}`);
+            await this.push(failedTestGroups);
+            return;
         }
         console.log(`[ci-queue] Populating tests`);
         if (seed !== undefined) {

javascript/src/queue/BaseRunner.ts

@@ -81,11 +81,16 @@ export class BaseRunner {
       return [];
     }
 
-    const failedTests = await this.client.hGetAll(this.retriedBuildKey('error-reports'));
-    console.log(`[ci-queue] Failed tests`, failedTests);
-    const failedTestGroups = Object.values(failedTests).map(test => JSON.parse(test).test_group);
-
-    return failedTestGroups;
+    try {
+      const failedTests = await this.client.hGetAll(this.retriedBuildKey('error-reports'));
+      console.log(`[ci-queue] Failed tests`, failedTests);
+      const failedTestGroups = Object.values(failedTests).map(test => JSON.parse(test).test_group);
+      return failedTestGroups;
+    } catch (e) {
+      // If the previous build is still in-progress, there may not be any failed tests
+      console.error('[ci-queue] Failed to get failed test groups from previous build', e);
+      return [];
+    }
   }
 
   async waitForMaster(): Promise<void> {

javascript/src/queue/Worker.ts

@@ -94,20 +94,13 @@ 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}`);
-      try {
-        const failedTestGroups = await this.getFailedTestGroupsFromPreviousBuild();
-        console.log(`[ci-queue] Failed test groups: ${failedTestGroups}`);
-        await this.push(failedTestGroups);
-        return;
-      } catch (e) {
-        // If the previous build is still in-progress, getFailedTestGroupsFromPreviousBuild will fail
-        // In this case, we want to continue processing the original tests
-        console.error('[ci-queue] Failed to get failed test groups from previous build', e);
-        console.log('[ci-queue] Continuing with original tests');
-      }
+      const failedTestGroups = await this.getFailedTestGroupsFromPreviousBuild();
+      console.log(`[ci-queue] Failed test groups: ${failedTestGroups}`);
+      await this.push(failedTestGroups);
+      return;
     }
-    console.log(`[ci-queue] Populating tests`);
 
+    console.log(`[ci-queue] Populating tests`);
     if (seed !== undefined) {
       tests = shuffleArray(tests, seed);
     }