fix tests more

Author: calvinmetcalf

build/test-replacements.js

@@ -167,6 +167,10 @@ module.exports['common.js'] = [
 ,   '\n/*<replacement>*/\nvar util = require(\'core-util-is\');\n'
   + 'util.inherits = require(\'inherits\');\n/*</replacement>*/\n'
 ]
+, [
+  /process\.binding\('timer_wrap'\)\.Timer;/,
+  '{now: function (){}}'
+]
 ]
 
 // this test has some trouble with the nextTick depth when run

package.json

@@ -22,9 +22,9 @@
   },
   "scripts": {
     "test": "tap test/parallel/*.js test/ours/*.js",
-    "browser": "npm run write-zuul && zuul -- test/browser.js",
+    "browser": "npm run write-zuul && zuul --browser-retries 2 -- test/browser.js",
     "write-zuul": "printf \"ui: tape\nbrowsers:\n  - name: $BROWSER_NAME\n    version: $BROWSER_VERSION\n\">.zuul.yml",
-    "local": "zuul --local -- test/browser.js",
+    "local": "zuul --local 3000 --no-coverage -- test/browser.js",
     "cover": "nyc npm test",
     "report": "nyc report --reporter=lcov"
   },

test/browser/test-stream-push-order.js

@@ -27,8 +27,7 @@ module.exports = function (t) {
     // ACTUALLY [1, 3, 5, 6, 4, 2]
 
     setTimeout(function() {
-      t.deepEqual(s._readableState.buffer,
-                       ['1', '2', '3', '4', '5', '6']);
+      t.equals(s._readableState.buffer.join(','), '1,2,3,4,5,6');
     });
   });
 }

test/browser/test-stream2-readable-from-list.js

@@ -1,16 +1,22 @@
-'use strict';
-var common = require('../common');
+// Flags: --expose_internals
+/*<replacement>*/
+var bufferShim = require('buffer-shims');
+/*</replacement>*/
+require('../common');
 var fromList = require('../../lib/_stream_readable')._fromList;
+var BufferList = require('../../lib/internal/streams/BufferList');
 
+function bufferListFromArray(arr) {
+  var bl = new BufferList();
+  for (var i = 0; i < arr.length; ++i) {
+    bl.push(arr[i]);
+  }return bl;
+}
 
 module.exports = function (t) {
-  t.test('buffers', function(t) {
-    // have a length
-    var len = 16;
-    var list = [ new Buffer('foog'),
-                 new Buffer('bark'),
-                 new Buffer('bazy'),
-                 new Buffer('kuel') ];
+  t.test('buffers', function (t) {
+    var list = [bufferShim.from('foog'), bufferShim.from('bark'), bufferShim.from('bazy'), bufferShim.from('kuel')];
+    list = bufferListFromArray(list);
 
     // read more than the first element.
     var ret = fromList(6, { buffer: list, length: 16 });
@@ -29,18 +35,14 @@ module.exports = function (t) {
     t.equal(ret.toString(), 'zykuel');
 
     // all consumed.
-    t.same(list, []);
+    t.same(list, new BufferList());
 
     t.end();
   });
 
-  t.test('strings', function(t) {
-    // have a length
-    var len = 16;
-    var list = [ 'foog',
-                 'bark',
-                 'bazy',
-                 'kuel' ];
+  t.test('strings', function (t) {
+    var list = ['foog', 'bark', 'bazy', 'kuel'];
+    list = bufferListFromArray(list);
 
     // read more than the first element.
     var ret = fromList(6, { buffer: list, length: 16, decoder: true });
@@ -59,7 +61,7 @@ module.exports = function (t) {
     t.equal(ret, 'zykuel');
 
     // all consumed.
-    t.same(list, []);
+    t.same(list, new BufferList());
 
     t.end();
   });

test/common.js

@@ -39,7 +39,7 @@ var util = require('core-util-is');
 util.inherits = require('inherits');
 /*</replacement>*/
 
-var Timer = process.binding('timer_wrap').Timer;
+var Timer = { now: function () {} };
 
 var testRoot = path.resolve(process.env.NODE_TEST_DIR || path.dirname(__filename));
 

test/parallel/test-stream-push-order.js

@@ -30,4 +30,4 @@ s.read(0);
 process.on('exit', function () {
   assert.deepStrictEqual(s._readableState.buffer.join(','), '1,2,3,4,5,6');
   console.log('ok');
-});
+});