Exit with SIGTERM when there's a timeout SIGTERM

Also, ignore in coverage, since it happens after nyc, and thus can't be covered.
tapjs · Jan 25, 2017 · 9bb81dc · 9bb81dc
1 parent 7510a6d
commit 9bb81dc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/lib/tap.js b/lib/tap.js
@@ -67,8 +67,9 @@ tap.synonyms = require('./synonyms.js')
 
 // SIGTERM means being forcibly killed, almost always by timeout
 var onExit = require('signal-exit')
+var didTimeoutKill = false
 onExit(function (code, signal) {
-  if (signal !== 'SIGTERM' || !didPipe)
+  if (signal !== 'SIGTERM' || !didPipe || didTimeoutKill)
     return
 
   var handles = process._getActiveHandles().filter(function (h) {
@@ -113,6 +114,9 @@ onExit(function (code, signal) {
     })
   }
 
+  // this is impossible to cover, because it happens after nyc has
+  // already done its stuff.
+  /* istanbul ignore else */
   if (!tap.results && tap.timeout)
     tap.timeout(extra)
   else {
@@ -125,6 +129,7 @@ onExit(function (code, signal) {
       var yaml = require('js-yaml')
       console.error(objToYaml(extra))
     }
-    process.exit(1)
+    didTimeoutKill = true
+    process.kill(process.pid, 'SIGTERM')
   }
 })
diff --git a/test/test/child-sigterm-after-end--bail--buffer.tap b/test/test/child-sigterm-after-end--bail--buffer.tap
@@ -8,7 +8,7 @@ possible timeout: SIGTERM received after tap end
   {"handles":[{"type":"Timer"}]}
   ...
 
-# child end code=1 signal=null
+# child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1
 
diff --git a/test/test/child-sigterm-after-end--bail.tap b/test/test/child-sigterm-after-end--bail.tap
@@ -8,7 +8,7 @@ possible timeout: SIGTERM received after tap end
   {"handles":[{"type":"Timer"}]}
   ...
 
-# child end code=1 signal=null
+# child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1
 
diff --git a/test/test/child-sigterm-after-end--buffer.tap b/test/test/child-sigterm-after-end--buffer.tap
@@ -8,7 +8,7 @@ possible timeout: SIGTERM received after tap end
   {"handles":[{"type":"Timer"}]}
   ...
 
-# child end code=1 signal=null
+# child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1
 
diff --git a/test/test/child-sigterm-after-end.tap b/test/test/child-sigterm-after-end.tap
@@ -8,7 +8,7 @@ possible timeout: SIGTERM received after tap end
   {"handles":[{"type":"Timer"}]}
   ...
 
-# child end code=1 signal=null
+# child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1