Fix some issues with testing

- added tape-catch-onerror to catch async errors via window.onerror
- node-test-timers-first-fire.js failed sometimes because of rounding
errors etc.

Author: jscissr

bin/download-node-tests.js

@@ -189,13 +189,13 @@ function testfixer (filename) {
       // require timers explicitly and set global functions
       line = "var mockProcess = new (require('events').EventEmitter)()\n" +
         'mockProcess.nextTick = process.nextTick\n' +
-        'mockProcess.hrtime = process.hrtime || function (last) {\n' +
+        'mockProcess.hrtime = function (last) {\n' +
         "  var now = typeof performance !== 'undefined' && performance.now ?\n" +
         '    performance.now() : +new Date\n' +
         '  return [now / 1e3 - (last && last[0] || 0), 0]\n' +
         '}\n' +
         'var origSetTimeout = setTimeout\n' +
-        "var test = require('tape-catch')\n" +
+        "var test = require('tape-catch-onerror')\n" +
         "test('" + filename + "', function (tape) {\n" +
         '  var process = mockProcess\n' +
         "  var timers = require('../timers')\n" +
@@ -216,6 +216,11 @@ function testfixer (filename) {
       firstline = false
     }
 
+    // fix to ignore rounding errors
+    if (filename === 'test-timers-first-fire.js') {
+      line = line.replace("assert.ok(delta > 0, 'Timer fired early');", "assert.ok(delta > -0.001, 'Timer fired early');")
+    }
+
     // comment out require('common')
     line = line.replace(/^(var common = require.*)/, '// $1')
 
@@ -231,7 +236,7 @@ function testfixer (filename) {
     if (/process\.exit/.test(line)) {
       callsExit = true
     }
-    
+
     line = line.replace(/(var Timer = process\.binding\('timer_wrap'\)\.Timer;)$/,
       '// $1\n' +
       'var Timer = {}\n' +

package.json

@@ -16,7 +16,7 @@
     "hyperquest": "^1.0.1",
     "split": "^0.3.3",
     "tape": "^3.5.0",
-    "tape-catch": "^1.0.4",
+    "tape-catch-onerror": "^1.0.3",
     "through2": "^0.6.3",
     "zuul": "^1.17.1"
   },

test/node-pummel-test-timers.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('pummel-test-timers.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-first-fire.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-first-fire.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')
@@ -48,8 +48,8 @@ setTimeout(function() {
   var hr = process.hrtime(last);
   var ms = (hr[0] * 1e3) + (hr[1] / 1e6);
   var delta = ms - TIMEOUT;
-   console.log('timer fired in', delta);
-  assert.ok(delta > 0, 'Timer fired early');
+//   console.log('timer fired in', delta);
+  assert.ok(delta > -0.001, 'Timer fired early');
 }, TIMEOUT);
 
 

test/node-test-timers-immediate-queue.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-immediate-queue.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-immediate.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-immediate.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-linked-list.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-linked-list.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-non-integer-delay.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-non-integer-delay.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-ordering.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-ordering.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-this.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-this.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-unref-active.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-unref-active.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-unref-remove-other-unref-timers-only-one-fires.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-unref-remove-other-unref-timers-only-one-fires.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-unref-remove-other-unref-timers.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-unref-remove-other-unref-timers.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-unrefd-interval-still-fires.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-unrefd-interval-still-fires.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers-zero-timeout.js

@@ -1,12 +1,12 @@
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers-zero-timeout.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/node-test-timers.js

@@ -1,13 +1,13 @@
 Array.prototype.forEach||(Array.prototype.forEach=function(r,t){var o,n;if(null==this)throw new TypeError("this is null or not defined");var e=Object(this),i=e.length>>>0;if("function"!=typeof r)throw new TypeError(r+" is not a function");for(arguments.length>1&&(o=t),n=0;i>n;){var a;n in e&&(a=e[n],r.call(o,a,n,e)),n++}});
 var mockProcess = new (require('events').EventEmitter)()
 mockProcess.nextTick = process.nextTick
-mockProcess.hrtime = process.hrtime || function (last) {
+mockProcess.hrtime = function (last) {
   var now = typeof performance !== 'undefined' && performance.now ?
     performance.now() : +new Date
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-timers.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/test-unref.js

@@ -5,7 +5,7 @@ mockProcess.hrtime = process.hrtime || function (last) {
   return [now / 1e3 - (last && last[0] || 0), 0]
 }
 var origSetTimeout = setTimeout
-var test = require('tape-catch')
+var test = require('tape-catch-onerror')
 test('test-unref.js', function (tape) {
   var process = mockProcess
   var timers = require('../timers')

test/test.js

@@ -1,4 +1,4 @@
-var test = require('tape-catch');
+var test = require('tape-catch-onerror');
 var timers = require('../timers');
 
 var setTimeout = timers.setTimeout;