fixup! fixup! fixup! fixup! fixup! Fix Run tests failure reporting

EduardSergeev · Aug 27, 2023 · 4fb5e41 · 4fb5e41
1 parent be1b001
commit 4fb5e41
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -21,7 +21,7 @@ jobs:
     - run: npm install
 
     - name: Run tests
-      uses: GabrielBB/xvfb-action@v1
+      uses: smithki/xvfb-action@v1.1.2
       with:
         run: npm run test
 

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -44,15 +44,10 @@ jobs:
 
     - run: npm install
 
-    - name: Run Linux tests
-      if: runner.os == 'Linux'
-      run: |
-        sudo apt-get install -y xvfb
-        xvfb-run --auto-servernum npm run test
-
-    - name: Run Windows & MacOS tests
-      if: runner.os != 'Linux'
-      run: npm run test
+    - name: Run tests
+      uses: smithki/xvfb-action@v1.1.2
+      with:
+        run: npm test
 
     - name: Add GHC extension output (on failure on Linux or MacOS)
       if: failure() && runner.os != 'Windows'
@@ -82,7 +77,7 @@ jobs:
     - run: npm install
 
     - name: Run tests with coverage
-      uses: GabrielBB/xvfb-action@v1
+      uses: smithki/xvfb-action@v1.1.2
       with:
         run: npm run coverage
 

diff --git a/src/test/runTest.ts b/src/test/runTest.ts
@@ -37,6 +37,9 @@ async function main(): Promise<number> {
       });
     }
 
+    // This is required for Mocha tests to report non-zero exit code in case of test failure
+    process.removeAllListeners('exit');
+
     // Download VS Code, unzip it and run the integration test
     return await runTests({
       vscodeExecutablePath,
@@ -62,7 +65,7 @@ async function main(): Promise<number> {
   } catch (err) {
     console.error(err);
     console.error('Failed to run tests');
-    return 1;
+    process.exit(1);
   }
 }