Don't end before implicit bailout from bufferend child bailout

tapjs · Jan 9, 2017 · 642fada · 642fada
1 parent c82c752
commit 642fada
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 1 deletion.
diff --git a/lib/test.js b/lib/test.js
@@ -586,7 +586,7 @@ Test.prototype._runChild = function runChild (child, name, extra, cb) {
       extra._tapChildBailed = child._bailedOut
       self.ok(child._ok, child._name, extra)
 
-      if (endThis) {
+      if (endThis && !child._bailedOut) {
         self._ending = false
         self.end(IMPLICIT)
       }

diff --git a/test/test/descendant-fail--bail--buffer.tap b/test/test/descendant-fail--bail--buffer.tap
@@ -0,0 +1,17 @@
+TAP version 13
+1..1
+not ok 1 - parent {
+    1..1
+    not ok 1 - child {
+        1..1
+        not ok 1 - nope
+          ---
+          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          ...
+
+        Bail out! # nope
+    }
+}
+
+Bail out! # nope
+
diff --git a/test/test/descendant-fail--bail.tap b/test/test/descendant-fail--bail.tap
@@ -0,0 +1,14 @@
+TAP version 13
+1..1
+# Subtest: parent
+    1..1
+    # Subtest: child
+        1..1
+        not ok 1 - nope
+          ---
+          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          ...
+
+        Bail out! # nope
+Bail out! # nope
+
diff --git a/test/test/descendant-fail--buffer.tap b/test/test/descendant-fail--buffer.tap
@@ -0,0 +1,20 @@
+TAP version 13
+1..1
+not ok 1 - parent {
+    1..1
+    not ok 1 - child {
+        1..1
+        not ok 1 - nope
+          ---
+          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          ...
+
+        # failed 1 of 1 tests
+    }
+
+    # failed 1 of 1 tests
+}
+
+# failed 1 of 1 tests
+___/# time=[0-9.]+(ms)?/~~~
+
diff --git a/test/test/descendant-fail.js b/test/test/descendant-fail.js
@@ -0,0 +1,9 @@
+var t = require('../..')
+t.plan(1)
+t.test('parent', function (t) {
+  t.plan(1)
+  t.test('child', function (t) {
+    t.plan(1)
+    t.fail('nope')
+  })
+})
diff --git a/test/test/descendant-fail.tap b/test/test/descendant-fail.tap
@@ -0,0 +1,20 @@
+TAP version 13
+1..1
+# Subtest: parent
+    1..1
+    # Subtest: child
+        1..1
+        not ok 1 - nope
+          ---
+          {"at":{"column":7,"file":"test/test/descendant-fail.js","line":7},"source":"t.fail('nope')\n"}
+          ...
+
+        # failed 1 of 1 tests
+    not ok 1 - child ___/# time=[0-9.]+(ms)?/~~~
+
+    # failed 1 of 1 tests
+not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
+
+# failed 1 of 1 tests
+___/# time=[0-9.]+(ms)?/~~~
+