test: fix pummel test failures

Trott · Myles Borins · commit eb15c8d83baf · 2016-04-20T11:20:55.000-07:00
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 <cjihrig@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
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);
 

-Original file line number
+Diff line change
@@ @@ -1,10 +1,9 @@ @@
 'use strict';
 -varcommon=require('../common');
 -varassert=require('assert');
 +constcommon=require('../common');
 +constassert=require('assert');
 +constcrypto=require('crypto');
 -try{
 -varcrypto=require('crypto');
 -}catch(e){
 +if(!common.hasCrypto){
 console.log('1..0 # Skipped: node compiled without OpenSSL.');
 return;
+}
-Original file line number
+Diff line change
 varframes=['stalloogle','bagnoogle','doogle'];
 varstalloogle=function(str){
 -expected=str;
 +global.expected=str;
 os.loadavg();
 };
-Original file line number
+Diff line change
@@ @@ -1,15 +1,15 @@ @@
 'use strict';
 -varcommon=require('../common');
 -varassert=require('assert');
 -varnet=require('net');
 +constcommon=require('../common');
 +constassert=require('assert');
 +constnet=require('net');
 -varN=1024*1024;
 -varpart_N=N/3;
 +constN=1024*1024;
 +constpart_N=N/3;
 varchars_recved=0;
 varnpauses=0;
 console.log('build big string');
 -body='C'.repeat(N);
 +constbody='C'.repeat(N);
 console.log('start server on port '+common.PORT);