Actually print #time at the end of the TAP test

This was emitting a 'data' event, but only after 'end', which does nada.

lib/base.js

@@ -149,12 +149,16 @@ Base.prototype.oncomplete = function (results) {
     delete f.ok
     return f.tapError
   })
+
   if (failures.length)
     this.options.failures = failures
+
+  this.onbeforeend()
   this.emit('end')
   this.ondone()
 }
 
+Base.prototype.onbeforeend = function () {}
 Base.prototype.ondone = function () {}
 
 Base.prototype.setupParser = function (options) {

lib/tap.js

@@ -37,9 +37,12 @@ TAP.prototype.onbail = function () {
   process.exit(1)
 }
 
-TAP.prototype.ondone = function () {
-  if (didPipe && this.time)
+TAP.prototype.onbeforeend = function () {
+  if (didPipe && this.time && !this.bailedOut)
     this.emit('data', '# time=' + this.time + 'ms\n')
+}
+
+TAP.prototype.ondone = function () {
   this.emit('teardown')
 }
 

test/test/assert-at--buffer.tap

@@ -26,4 +26,5 @@ not ok 1 - foo ___/# time=[0-9.]+(ms)?/~~~ {
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/assert-at.tap

@@ -26,4 +26,5 @@ not ok 1 - foo ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/assert-todo-skip--bail--buffer.tap

@@ -22,4 +22,5 @@ ok 1 - not much ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/assert-todo-skip--bail.tap

@@ -22,4 +22,5 @@ TAP version 13
 ok 1 - not much ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/assert-todo-skip--buffer.tap

@@ -22,4 +22,5 @@ ok 1 - not much ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/assert-todo-skip.tap

@@ -22,4 +22,5 @@ TAP version 13
 ok 1 - not much ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/async--bail--buffer.tap

@@ -10,4 +10,5 @@ ok 2 - second test (async) ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 1..2
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/async--bail.tap

@@ -10,4 +10,5 @@ ok 1 - first test ___/# time=[0-9.]+(ms)?/~~~
 ok 2 - second test (async) ___/# time=[0-9.]+(ms)?/~~~
 
 1..2
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/async--buffer.tap

@@ -10,4 +10,5 @@ ok 2 - second test (async) ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 1..2
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/async.tap

@@ -10,4 +10,5 @@ ok 1 - first test ___/# time=[0-9.]+(ms)?/~~~
 ok 2 - second test (async) ___/# time=[0-9.]+(ms)?/~~~
 
 1..2
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each--bail--buffer.tap

@@ -34,4 +34,5 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
 done
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each--bail.tap

@@ -34,4 +34,5 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
 done
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each--buffer.tap

@@ -34,4 +34,5 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
 done
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-async--bail--buffer.tap

@@ -24,4 +24,5 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-async--bail.tap

@@ -24,4 +24,5 @@ after 1 parent
 ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-async--buffer.tap

@@ -24,4 +24,5 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-async.tap

@@ -24,4 +24,5 @@ after 1 parent
 ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-plan--bail--buffer.tap

@@ -21,5 +21,6 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
     }
 }
 
+___/# time=[0-9.]+(ms)?/~~~
 done
 

test/test/before-after-each-plan--bail.tap

@@ -23,5 +23,6 @@ after 1 child
 after 1 parent
 ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
+___/# time=[0-9.]+(ms)?/~~~
 done
 

test/test/before-after-each-plan--buffer.tap

@@ -21,5 +21,6 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
     }
 }
 
+___/# time=[0-9.]+(ms)?/~~~
 done
 

test/test/before-after-each-plan.tap

@@ -23,5 +23,6 @@ after 1 child
 after 1 parent
 ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
+___/# time=[0-9.]+(ms)?/~~~
 done
 

test/test/before-after-each-promise--buffer.tap

@@ -32,4 +32,5 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-promise.tap

@@ -32,4 +32,5 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-raise--buffer.tap

@@ -32,4 +32,5 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
 done
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-raise.tap

@@ -32,4 +32,5 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 done
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-throw--buffer.tap

@@ -32,4 +32,5 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
 done
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each-throw.tap

@@ -32,4 +32,5 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 done
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/before-after-each.tap

@@ -34,4 +34,5 @@ ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~
 
 done
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/buffer-yaml--buffer.tap

@@ -6,4 +6,5 @@ not ok 1 - should be equivalent
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/buffer-yaml.tap

@@ -6,4 +6,5 @@ not ok 1 - should be equivalent
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/buffered--bail--buffer.tap

@@ -25,6 +25,7 @@ ok 3 - unbuffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 }
 
 ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
@@ -41,7 +42,9 @@ ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 }
 
 1..4
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/buffered--bail.tap

@@ -25,6 +25,7 @@ ok 2 - buffered ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 ok 3 - unbuffered spawn ___/# time=[0-9.]+(ms)?/~~~
 
 ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
@@ -41,7 +42,9 @@ ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 }
 
 1..4
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/buffered--buffer.tap

@@ -25,6 +25,7 @@ ok 3 - unbuffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 }
 
 ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
@@ -41,7 +42,9 @@ ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 }
 
 1..4
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/buffered.tap

@@ -25,6 +25,7 @@ ok 2 - buffered ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 ok 3 - unbuffered spawn ___/# time=[0-9.]+(ms)?/~~~
 
 ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
@@ -41,7 +42,9 @@ ok 4 - buffered spawn ___/# time=[0-9.]+(ms)?/~~~ {
     }
 
     1..2
+    ___/# time=[0-9.]+(ms)?/~~~
 }
 
 1..4
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/catch-tap-throws--buffer.tap

@@ -88,4 +88,5 @@ not ok 12 - test after end() was called ___/# time=[0-9.]+(ms)?/~~~
 64
 1..12
 # failed 6 of 12 tests
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/catch-tap-throws.tap

@@ -88,4 +88,5 @@ not ok 12 - test after end() was called ___/# time=[0-9.]+(ms)?/~~~
 64
 1..12
 # failed 6 of 12 tests
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-sigterm-after-end--bail--buffer.tap

@@ -3,6 +3,7 @@ TAP version 13
 TAP version 13
 ok 1 - this is fine
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 possible timeout: SIGTERM received after tap end
   ---
   {"handles":[{"type":"Timer"}]}
@@ -11,4 +12,5 @@ possible timeout: SIGTERM received after tap end
 # child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-sigterm-after-end--bail.tap

@@ -3,6 +3,7 @@ TAP version 13
 TAP version 13
 ok 1 - this is fine
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 possible timeout: SIGTERM received after tap end
   ---
   {"handles":[{"type":"Timer"}]}
@@ -11,4 +12,5 @@ possible timeout: SIGTERM received after tap end
 # child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-sigterm-after-end--buffer.tap

@@ -3,6 +3,7 @@ TAP version 13
 TAP version 13
 ok 1 - this is fine
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 possible timeout: SIGTERM received after tap end
   ---
   {"handles":[{"type":"Timer"}]}
@@ -11,4 +12,5 @@ possible timeout: SIGTERM received after tap end
 # child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-sigterm-after-end.tap

@@ -3,6 +3,7 @@ TAP version 13
 TAP version 13
 ok 1 - this is fine
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 possible timeout: SIGTERM received after tap end
   ---
   {"handles":[{"type":"Timer"}]}
@@ -11,4 +12,5 @@ possible timeout: SIGTERM received after tap end
 # child end code=null signal="SIGTERM"
 ok 1 - should not be equal
 1..1
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-text-buffer--buffer.tap

@@ -23,4 +23,5 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-text-buffer.tap

@@ -23,4 +23,5 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-text-indentsub--buffer.tap

@@ -23,4 +23,5 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/#
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-text-indentsub.tap

@@ -23,4 +23,5 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/#
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-text-sub--buffer.tap

@@ -23,4 +23,5 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/child-text-sub.tap

@@ -23,4 +23,5 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]
 
 1..1
 # failed 1 test
+___/# time=[0-9.]+(ms)?/~~~
 

test/test/console-log--bail--buffer.tap

@@ -38,4 +38,5 @@ ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
 
 ok 5 - pass after async kid
 1..5
+___/# time=[0-9.]+(ms)?/~~~