No need to # in the Bail out! message

isaacs · isaacs · commit 5282f6cfd174 · 2017-01-28T01:42:43.000-08:00
diff --git a/lib/test.js b/lib/test.js
@@ -148,8 +148,7 @@ Test.prototype.bailout = function (message) {
     this.parent.bailout(message)
   else {
     this.process()
-    message = message ? ' # ' + ('' + message).trim() : ''
-    message = message.replace(/^( #)+ /, ' # ')
+    message = message ? ' ' + ('' + message).trim() : ''
     message = message.replace(/[\r\n]/g, ' ')
     this.parser.write('Bail out!' + message + '\n')
   }
diff --git a/test/test/bail-error-object--bail--buffer.tap b/test/test/bail-error-object--bail--buffer.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # TypeError: wat
+Bail out! TypeError: wat
 
diff --git a/test/test/bail-error-object--bail.tap b/test/test/bail-error-object--bail.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # TypeError: wat
+Bail out! TypeError: wat
 
diff --git a/test/test/bail-error-object--buffer.tap b/test/test/bail-error-object--buffer.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # TypeError: wat
+Bail out! TypeError: wat
 
diff --git a/test/test/bail-error-object.tap b/test/test/bail-error-object.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # TypeError: wat
+Bail out! TypeError: wat
 
diff --git a/test/test/bail-teardown--bail--buffer.tap b/test/test/bail-teardown--bail--buffer.tap
@@ -5,5 +5,5 @@ ok 2 - child ___/# time=[0-9.]+(ms)?/~~~ {
     1..1
 }
 
-Bail out! # i did not want to be torn down
+Bail out! i did not want to be torn down
 
diff --git a/test/test/bail-teardown--bail.tap b/test/test/bail-teardown--bail.tap
@@ -5,5 +5,5 @@ ok 1 - this is fine
     1..1
 ok 2 - child ___/# time=[0-9.]+(ms)?/~~~
 
-Bail out! # i did not want to be torn down
+Bail out! i did not want to be torn down
 
diff --git a/test/test/bail-teardown--buffer.tap b/test/test/bail-teardown--buffer.tap
@@ -5,5 +5,5 @@ ok 2 - child ___/# time=[0-9.]+(ms)?/~~~ {
     1..1
 }
 
-Bail out! # i did not want to be torn down
+Bail out! i did not want to be torn down
 
diff --git a/test/test/bail-teardown-async--bail--buffer.tap b/test/test/bail-teardown-async--bail--buffer.tap
@@ -3,5 +3,5 @@ ok 1 - foobar test ___/# time=[0-9.]+(ms)?/~~~ {
     1..0
 }
 
-Bail out! # teardown fail
+Bail out! teardown fail
 
diff --git a/test/test/bail-teardown-async--bail.tap b/test/test/bail-teardown-async--bail.tap
@@ -4,5 +4,5 @@ TAP version 13
 ok 1 - foobar test ___/# time=[0-9.]+(ms)?/~~~
 
 # Subtest: barfoo
-Bail out! # teardown fail
+Bail out! teardown fail
 
diff --git a/test/test/bail-teardown-async--buffer.tap b/test/test/bail-teardown-async--buffer.tap
@@ -3,5 +3,5 @@ ok 1 - foobar test ___/# time=[0-9.]+(ms)?/~~~ {
     1..0
 }
 
-Bail out! # teardown fail
+Bail out! teardown fail
 
diff --git a/test/test/bail-teardown-async.tap b/test/test/bail-teardown-async.tap
@@ -4,5 +4,5 @@ TAP version 13
 ok 1 - foobar test ___/# time=[0-9.]+(ms)?/~~~
 
 # Subtest: barfoo
-Bail out! # teardown fail
+Bail out! teardown fail
 
diff --git a/test/test/bail-teardown.tap b/test/test/bail-teardown.tap
@@ -5,5 +5,5 @@ ok 1 - this is fine
     1..1
 ok 2 - child ___/# time=[0-9.]+(ms)?/~~~
 
-Bail out! # i did not want to be torn down
+Bail out! i did not want to be torn down
 
diff --git a/test/test/bailout--buffer.tap b/test/test/bailout--buffer.tap
@@ -22,7 +22,7 @@ not ok 3 - this fails
 
 not ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
     1..2
-    Bail out! # cannot continue
+    Bail out! # # # cannot continue
 }
-Bail out! # cannot continue
+Bail out! # # # cannot continue
 
diff --git a/test/test/bailout-with-stuff-after--bail--buffer.tap b/test/test/bailout-with-stuff-after--bail--buffer.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # this is fine
+Bail out! this is fine
 
diff --git a/test/test/bailout-with-stuff-after--bail.tap b/test/test/bailout-with-stuff-after--bail.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # this is fine
+Bail out! this is fine
 
diff --git a/test/test/bailout-with-stuff-after--buffer.tap b/test/test/bailout-with-stuff-after--buffer.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # this is fine
+Bail out! this is fine
 
diff --git a/test/test/bailout-with-stuff-after.tap b/test/test/bailout-with-stuff-after.tap
@@ -1,3 +1,3 @@
 TAP version 13
-Bail out! # this is fine
+Bail out! this is fine
 
diff --git a/test/test/bailout.js b/test/test/bailout.js
@@ -23,7 +23,7 @@ t.test('async kid', function (t) {
     t.pass('first timeout', { foo: 'blz' })
   }, 50)
   setTimeout(function () {
-    t.bailout('cannot continue')
+    t.bailout('# # # cannot continue')
   })
 })
 
diff --git a/test/test/bailout.tap b/test/test/bailout.tap
@@ -23,6 +23,6 @@ not ok 3 - this fails
 
 # Subtest: async kid
     1..2
-    Bail out! # cannot continue
-Bail out! # cannot continue
+    Bail out! # # # cannot continue
+Bail out! # # # cannot continue
 
diff --git a/test/test/exit-on-bailout--bail--buffer.tap b/test/test/exit-on-bailout--bail--buffer.tap
@@ -6,8 +6,8 @@ log in grandchild, after bailout
 log in child, after grandchild
 not ok 1 - child {
     not ok 1 - grandchild ___/# time=[0-9.]+(ms)?/~~~ {
-        Bail out! # cannot continue
+        Bail out! cannot continue
     }
 }
-Bail out! # cannot continue
+Bail out! cannot continue
 
diff --git a/test/test/exit-on-bailout--bail.tap b/test/test/exit-on-bailout--bail.tap
@@ -4,6 +4,6 @@ log in child, before grandchild
 # Subtest: child
 log in grandchild, before bailout
     # Subtest: grandchild
-        Bail out! # cannot continue
-Bail out! # cannot continue
+        Bail out! cannot continue
+Bail out! cannot continue
 
diff --git a/test/test/exit-on-bailout--buffer.tap b/test/test/exit-on-bailout--buffer.tap
@@ -6,8 +6,8 @@ log in grandchild, after bailout
 log in child, after grandchild
 not ok 1 - child {
     not ok 1 - grandchild ___/# time=[0-9.]+(ms)?/~~~ {
-        Bail out! # cannot continue
+        Bail out! cannot continue
     }
 }
-Bail out! # cannot continue
+Bail out! cannot continue
 
diff --git a/test/test/exit-on-bailout.tap b/test/test/exit-on-bailout.tap
@@ -4,6 +4,6 @@ log in child, before grandchild
 # Subtest: child
 log in grandchild, before bailout
     # Subtest: grandchild
-        Bail out! # cannot continue
-Bail out! # cannot continue
+        Bail out! cannot continue
+Bail out! cannot continue
 
diff --git a/test/test/pragma--buffer.tap b/test/test/pragma--buffer.tap
@@ -23,7 +23,7 @@ not ok 2 - ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child bailout ___/# time=[0-9
   {"args":["___/.*/~~~pragma.js","child","bailout"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
   ...
 {
-    Bail out! # no pragmas come after bailout
+    Bail out! no pragmas come after bailout
 }
-Bail out! # no pragmas come after bailout
+Bail out! no pragmas come after bailout
 
diff --git a/test/test/pragma.tap b/test/test/pragma.tap
@@ -18,6 +18,6 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child ___/# time=[0-9.]+(ms)?
 
 pragma -child
 # Subtest: ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child bailout
-    Bail out! # no pragmas come after bailout
-Bail out! # no pragmas come after bailout
+    Bail out! no pragmas come after bailout
+Bail out! no pragmas come after bailout
 
diff --git a/test/test/throw--buffer.tap b/test/test/throw--buffer.tap
@@ -38,7 +38,7 @@ not ok 3 - this fails
 
 not ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
     1..2
-    Bail out! # cannot continue
+    Bail out! cannot continue
 }
-Bail out! # cannot continue
+Bail out! cannot continue
 
diff --git a/test/test/throw.tap b/test/test/throw.tap
@@ -38,6 +38,6 @@ not ok 3 - this fails
 
 # Subtest: async kid
     1..2
-    Bail out! # cannot continue
-Bail out! # cannot continue
+    Bail out! cannot continue
+Bail out! cannot continue
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`TAP version 13`
`2`		`-Bail out! # TypeError: wat`
	`2`	`+Bail out! TypeError: wat`
`3`	`3`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ ok 2 - child ___/# time=[0-9.]+(ms)?/~~~ {`
`5`	`5`	`1..1`
`6`	`6`	`}`
`7`	`7`
`8`		`-Bail out! # i did not want to be torn down`
	`8`	`+Bail out! i did not want to be torn down`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ ok 1 - foobar test ___/# time=[0-9.]+(ms)?/~~~ {`
`3`	`3`	`1..0`
`4`	`4`	`}`
`5`	`5`
`6`		`-Bail out! # teardown fail`
	`6`	`+Bail out! teardown fail`
`7`	`7`