From 4934798c0dc4e511be93742a50108b242805038f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 30 Jan 2016 22:58:19 -0800 Subject: [PATCH] test: pummel test fixes This fixes some variable redeclarations in pummel tests and, in the process, gets `test-stream-pipe-multi.js` to run again. It had been failing to run. PR-URL: https://github.com/nodejs/node/pull/4998 Reviewed-By: Brian White Reviewed-By: James M Snell --- test/pummel/test-crypto-dh.js | 4 ++-- test/pummel/test-exec.js | 5 +++-- test/pummel/test-stream-pipe-multi.js | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/pummel/test-crypto-dh.js b/test/pummel/test-crypto-dh.js index 1a2020cd55..596d107a28 100644 --- a/test/pummel/test-crypto-dh.js +++ b/test/pummel/test-crypto-dh.js @@ -30,7 +30,7 @@ var hashes = { modp18 : 'a870b491bbbec9b131ae9878d07449d32e54f160' }; -for (var name in hashes) { +for (const name in hashes) { var group = crypto.getDiffieHellman(name); var private_key = group.getPrime('hex'); var hash1 = hashes[name]; @@ -40,7 +40,7 @@ for (var name in hashes) { assert.equal(group.getGenerator('hex'), '02'); } -for (var name in hashes) { +for (const name in hashes) { // modp1 is 768 bits, FIPS requires >= 1024 if (name == 'modp1' && common.hasFipsCrypto) continue; diff --git a/test/pummel/test-exec.js b/test/pummel/test-exec.js index 994d859f40..90abaf6caa 100644 --- a/test/pummel/test-exec.js +++ b/test/pummel/test-exec.js @@ -3,13 +3,14 @@ var common = require('../common'); var assert = require('assert'); var exec = require('child_process').exec; +var SLEEP3_COMMAND; if (!common.isWindows) { // Unix. - var SLEEP3_COMMAND = 'sleep 3'; + SLEEP3_COMMAND = 'sleep 3'; } else { // Windows: `choice` is a command built into cmd.exe. Use another cmd process // to create a process tree, so we can catch bugs related to it. - var SLEEP3_COMMAND = 'cmd /c choice /t 3 /c X /d X'; + SLEEP3_COMMAND = 'cmd /c choice /t 3 /c X /d X'; } diff --git a/test/pummel/test-stream-pipe-multi.js b/test/pummel/test-stream-pipe-multi.js index 44d6973938..4524f8ca0b 100644 --- a/test/pummel/test-stream-pipe-multi.js +++ b/test/pummel/test-stream-pipe-multi.js @@ -49,11 +49,11 @@ process.on('exit', function() { assert.equal(cnt, rclosed, 'readable streams closed'); }); -for (var i = 0; i < chunkSize; i++) { - chunkSize[i] = i % 256; +for (let i = 0; i < chunkSize; i++) { + data[i] = i; } -for (var i = 0; i < cnt; i++) { +for (let i = 0; i < cnt; i++) { var r = new FakeStream(); r.on('close', function() { console.error(this.ID, 'read close');