test: fix pummel test failures

A handful of tests in `test/pummel` were failing due to undefined variables. The tests in pummel are not run in CI or otherwise exercised regularly so these failures can go unnoticed for a long time. PR-URL: #6012 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
nodejs · Apr 20, 2016 · 8da4bad · 8da4bad
1 parent 6d9c0c9
commit 8da4bad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/test/pummel/test-crypto-dh.js b/test/pummel/test-crypto-dh.js
@@ -1,10 +1,9 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
+const crypto = require('crypto');
 
-try {
-  var crypto = require('crypto');
-} catch (e) {
+if (!common.hasCrypto) {
   console.log('1..0 # Skipped: node compiled without OpenSSL.');
   return;
 }

diff --git a/test/pummel/test-dtrace-jsstack.js b/test/pummel/test-dtrace-jsstack.js
@@ -14,7 +14,7 @@ if (os.type() != 'SunOS') {
 var frames = [ 'stalloogle', 'bagnoogle', 'doogle' ];
 
 var stalloogle = function(str) {
-  expected = str;
+  global.expected = str;
   os.loadavg();
 };
 

diff --git a/test/pummel/test-net-throttle.js b/test/pummel/test-net-throttle.js
@@ -1,15 +1,15 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
 
-var N = 1024 * 1024;
-var part_N = N / 3;
+const N = 1024 * 1024;
+const part_N = N / 3;
 var chars_recved = 0;
 var npauses = 0;
 
 console.log('build big string');
-body = 'C'.repeat(N);
+const body = 'C'.repeat(N);
 
 console.log('start server on port ' + common.PORT);