update tests so that they pass on v0.10

package.json

@@ -36,7 +36,7 @@
     "tap-mocha-reporter": "^3.0.1",
     "tap-parser": "^5.3.1",
     "tmatch": "^3.0.0",
-    "trivial-deferred": "^1.0.0",
+    "trivial-deferred": "^1.0.1",
     "yapool": "^1.0.0"
   },
   "keywords": [

scripts/generate-test-test.js

@@ -93,7 +93,7 @@ function deStackify (data) {
       return res
     } else if (k === 'msecs' && typeof data[k] === 'number') {
       return res
-    } else if (k === 'function' && typeof data[k] === 'string' && data[k].indexOf('._onTimeout') !== -1) {
+    } else if (k === 'function' && typeof data[k] === 'string') {
       return res
     } else if (typeof data[k] === 'object' && data[k]) {
       if (k === 'at') {

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

@@ -2,7 +2,7 @@ TAP version 13
 not ok 1 - foo ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"baz","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
 
     Bail out! # baz

test/test/assert-at--bail.tap

@@ -2,7 +2,7 @@ TAP version 13
 # Subtest: foo
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"baz","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
 
     Bail out! # baz

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

@@ -2,22 +2,22 @@ TAP version 13
 not ok 1 - foo ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"baz","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
 
     not ok 2 - bler
       ---
-      {"at":{"column":5,"file":"test/test/assert-at.js","function":"bler","line":25},"source":"t.fail('bler')\n"}
+      {"at":{"column":5,"file":"test/test/assert-at.js","line":25},"source":"t.fail('bler')\n"}
       ...
 
     not ok 3 - bar
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"bar","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
 
     not ok 4 - bar stack
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"bar","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
 
     1..4

test/test/assert-at.tap

@@ -2,22 +2,22 @@ TAP version 13
 # Subtest: foo
     not ok 1 - baz
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"baz","line":14},"source":"blo(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":14},"source":"blo(t)\n"}
       ...
 
     not ok 2 - bler
       ---
-      {"at":{"column":5,"file":"test/test/assert-at.js","function":"bler","line":25},"source":"t.fail('bler')\n"}
+      {"at":{"column":5,"file":"test/test/assert-at.js","line":25},"source":"t.fail('bler')\n"}
       ...
 
     not ok 3 - bar
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"bar","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
 
     not ok 4 - bar stack
       ---
-      {"at":{"column":3,"file":"test/test/assert-at.js","function":"bar","line":10},"source":"baz(t)\n"}
+      {"at":{"column":3,"file":"test/test/assert-at.js","line":10},"source":"baz(t)\n"}
       ...
 
     1..4

test/test/bail-fail-spawn--bail--buffer.tap

@@ -18,7 +18,7 @@ not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","function":"foo","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
 
                 Bail out! # nested failure

test/test/bail-fail-spawn--bail.tap

@@ -14,7 +14,7 @@ TAP version 13
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","function":"foo","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
 
                 Bail out! # nested failure

test/test/bail-fail-spawn--buffer.tap

@@ -18,7 +18,7 @@ not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","function":"foo","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
 
                 Bail out! # nested failure

test/test/bail-fail-spawn.tap

@@ -14,7 +14,7 @@ TAP version 13
                 ok 2 - this passes
                 not ok 3 - nested failure
                   ---
-                  {"at":{"column":10,"file":"test/test/nesting.js","function":"foo","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+                  {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
                   ...
 
                 Bail out! # nested failure

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

@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","function":"Test.<anonymous>","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
 
             Bail out! # this is fine

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

@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","function":"Test.<anonymous>","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
 
             Bail out! # this is fine

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

@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","function":"Test.<anonymous>","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
 
             1..2

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

@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","function":"Test.<anonymous>","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
+              {"at":{"column":17,"file":"test/test/before-after-each-raise.js","line":22},"source":"return cb(new Error('this is fine'))\n","test":"grandchild"}
               ...
 
             1..2

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

@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","function":"Test.<anonymous>","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
 
             Bail out! # this is fine

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

@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","function":"Test.<anonymous>","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
 
             Bail out! # this is fine

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

@@ -14,7 +14,7 @@ not ok 1 - parent ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - the only actual assertion
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","function":"Test.<anonymous>","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
 
             1..2

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

@@ -11,7 +11,7 @@ before 2 grandchild
 after 2 grandchild
             not ok 2 - this is fine
               ---
-              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","function":"Test.<anonymous>","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
+              {"at":{"column":16,"file":"test/test/before-after-each-throw.js","line":22},"source":"var er = new Error('this is fine')\n","test":"grandchild"}
               ...
 
             1..2

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

@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","function":"Test.exceed_plan_sync","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21

test/test/catch-tap-throws--bail.tap

@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","function":"Test.exceed_plan_sync","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21

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

@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","function":"Test.exceed_plan_sync","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21
@@ -54,7 +54,7 @@ ok 7 - assert_after_end_sync ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 8 - test after end() was called
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","function":"Test.assert_after_end_sync","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
+  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
   ...
 
 61

test/test/catch-tap-throws.tap

@@ -10,7 +10,7 @@ ok 1 - exceed_plan_sync ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - test count exceeds plan
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","function":"Test.exceed_plan_sync","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
+  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":12},"plan":1,"source":"t.pass(2)\n","test":"exceed_plan_sync"}
   ...
 
 21
@@ -54,7 +54,7 @@ ok 7 - assert_after_end_sync ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 8 - test after end() was called
   ---
-  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","function":"Test.assert_after_end_sync","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
+  {"at":{"column":7,"file":"test/test/catch-tap-throws.js","line":74},"plan":1,"source":"t.pass(8)\n","test":"assert_after_end_sync"}
   ...
 
 61

test/test/end-exception--bail--buffer.tap

@@ -7,7 +7,7 @@ ok 1 - (unnamed test) ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","function":"Test.<anonymous>","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
+  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
   ...
 
 Bail out! # beep

test/test/end-exception--bail.tap

@@ -7,7 +7,7 @@ ok 1 - (unnamed test) ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","function":"Test.<anonymous>","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
+  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
   ...
 
 Bail out! # beep

test/test/end-exception--buffer.tap

@@ -7,7 +7,7 @@ ok 1 - (unnamed test) ___/# time=[0-9.]+(ms)?/~~~ {
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","function":"Test.<anonymous>","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
+  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
   ...
 
 1..2

test/test/end-exception.tap

@@ -7,7 +7,7 @@ ok 1 - (unnamed test) ___/# time=[0-9.]+(ms)?/~~~
 
 not ok 2 - beep
   ---
-  {"at":{"column":11,"file":"test/test/end-exception.js","function":"Test.<anonymous>","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
+  {"at":{"column":11,"file":"test/test/end-exception.js","line":8},"source":"throw new Error('beep')\n","test":"(unnamed test)"}
   ...
 
 1..2

test/test/mocha-bdd.js

@@ -1,5 +1,7 @@
 if (typeof describe === 'undefined')
   require('../..').mochaGlobals()
+if (typeof Promise === 'undefined')
+  Promise = require('bluebird')
 
 describe('Array', function () {
   before('name', function (cb) {

test/test/mochalike--bail--buffer.tap

@@ -53,7 +53,7 @@ not ok 5 - failing indented things ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - has no asserts, only throws ___/# time=[0-9.]+(ms)?/~~~ {
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","function":"Test.<anonymous>","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
 
             Bail out! # false is not true on line 50

test/test/mochalike--bail.tap

@@ -53,7 +53,7 @@ ok 4 - reasonably indented things ___/# time=[0-9.]+(ms)?/~~~
         # Subtest: has no asserts, only throws
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","function":"Test.<anonymous>","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
 
             Bail out! # false is not true on line 50

test/test/mochalike--buffer.tap

@@ -53,7 +53,7 @@ not ok 5 - failing indented things ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - has no asserts, only throws ___/# time=[0-9.]+(ms)?/~~~ {
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","function":"Test.<anonymous>","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
 
             1..1
@@ -69,7 +69,7 @@ not ok 5 - failing indented things ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 2 - second subset ___/# time=[0-9.]+(ms)?/~~~ {
         not ok 1 - objectify the truthiness
           ---
-          {"actual":false,"at":{"column":5,"file":"test/test/mochalike.js","function":"Suite.fn","line":60},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
+          {"actual":false,"at":{"column":5,"file":"test/test/mochalike.js","line":60},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
           ...
 
         1..1

test/test/mochalike.tap

@@ -53,7 +53,7 @@ ok 4 - reasonably indented things ___/# time=[0-9.]+(ms)?/~~~
         # Subtest: has no asserts, only throws
             not ok 1 - false is not true on line 50
               ---
-              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","function":"Test.<anonymous>","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
+              {"actual":false,"at":{"column":7,"file":"test/test/mochalike.js","line":54},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(false, 'false is not true on line 50')\n","test":"has no asserts, only throws","type":"AssertionError"}
               ...
 
             1..1
@@ -69,7 +69,7 @@ ok 4 - reasonably indented things ___/# time=[0-9.]+(ms)?/~~~
     # Subtest: second subset
         not ok 1 - objectify the truthiness
           ---
-          {"actual":false,"at":{"column":5,"file":"test/test/mochalike.js","function":"Suite.fn","line":60},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
+          {"actual":false,"at":{"column":5,"file":"test/test/mochalike.js","line":60},"expected":true,"generatedMessage":false,"operator":"==","source":"ok(!{}, 'objectify the truthiness')\n","test":"second subset","type":"AssertionError"}
           ...
 
         1..1

test/test/nesting--bail--buffer.tap

@@ -12,7 +12,7 @@ not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
         ok 2 - this passes
         not ok 3 - nested failure
           ---
-          {"at":{"column":10,"file":"test/test/nesting.js","function":"foo","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
+          {"at":{"column":10,"file":"test/test/nesting.js","line":14},"compare":"===","found":1,"source":"tt.equal(1, '1', 'nested failure')\n","wanted":"1"}
           ...
 
         Bail out! # nested failure