exit code improvements

mochajs · Sep 16, 2019 · 8c68fe5 · 8c68fe5
1 parent 123a0d7
commit 8c68fe5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/cli/run-helpers.js b/lib/cli/run-helpers.js
@@ -25,7 +25,10 @@ exports.watchRun = watchRun;
  */
 const exitMochaLater = code => {
   process.on('exit', () => {
-    process.exitCode = Math.min(code, 255);
+    // when uncaught error, keep exitCode 1
+    if (!process.exitCode) {
+      process.exitCode = Math.min(code, 255);
+    }
   });
 };
 

diff --git a/lib/runner.js b/lib/runner.js
@@ -786,9 +786,16 @@ Runner.prototype.runSuite = function(suite, fn) {
  * @private
  */
 Runner.prototype.uncaught = function(err) {
+  // 'this.skip()' aborts hook/test execution by throwing an exception
   if (err instanceof Pending) {
     return;
   }
+  // allow uncaught exceptions to propagate and exit
+  if (this.allowUncaught) {
+    console.error('\n', err);
+    process.exit(1);
+  }
+
   if (err) {
     debug('uncaught exception %O', err);
   } else {