test: fix redeclared test-http-* vars

PR-URL: #4987 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Roman Klauke <[email protected]>

Author: Trott

test/parallel/test-http-dns-error.js

@@ -10,9 +10,6 @@ if (common.hasCrypto){
 console.log('1..0 # Skipped: missing crypto');
 }
 
-varexpected_bad_requests=0;
-varactual_bad_requests=0;
-
 varhost='********';
 host+=host;
 host+=host;
@@ -25,23 +22,20 @@ function do_not_call(){
 }
 
 functiontest(mod){
-expected_bad_requests+=2;
 
 // Bad host name should not throw an uncatchable exception.
 // Ensure that there is time to attach an error listener.
-varreq=mod.get({host: host,port: 42},do_not_call);
-req.on('error',function(err){
+varreq1=mod.get({host: host,port: 42},do_not_call);
+req1.on('error',common.mustCall(function(err){
 assert.equal(err.code,'ENOTFOUND');
-actual_bad_requests++;
-});
-// http.get() called req.end() for us
+}));
+// http.get() called req1.end() for us
 
-varreq=mod.request({method: 'GET',host: host,port: 42},do_not_call);
-req.on('error',function(err){
+varreq2=mod.request({method: 'GET',host: host,port: 42},do_not_call);
+req2.on('error',common.mustCall(function(err){
 assert.equal(err.code,'ENOTFOUND');
-actual_bad_requests++;
-});
-req.end();
+}));
+req2.end();
 }
 
 if(common.hasCrypto){
@@ -51,7 +45,3 @@ if (common.hasCrypto){
 }
 
 test(http);
-
-process.on('exit',function(){
-assert.equal(actual_bad_requests,expected_bad_requests);
-});

test/parallel/test-http-full-response.js

@@ -37,10 +37,10 @@ function runAb(opts, callback){
 varm=/DocumentLength:\s*(\d+)bytes/mi.exec(stdout);
 vardocumentLength=parseInt(m[1]);
 
-varm=/Completerequests:\s*(\d+)/mi.exec(stdout);
+m=/Completerequests:\s*(\d+)/mi.exec(stdout);
 varcompleteRequests=parseInt(m[1]);
 
-varm=/HTMLtransferred:\s*(\d+)bytes/mi.exec(stdout);
+m=/HTMLtransferred:\s*(\d+)bytes/mi.exec(stdout);
 varhtmlTransfered=parseInt(m[1]);
 
 assert.equal(bodyLength,documentLength);

test/parallel/test-http-parser.js

@@ -260,7 +260,7 @@ function expectBody(expected){
 assert.equal(versionMajor,1);
 assert.equal(versionMinor,0);
 
-varheaders=headers||parser.headers;
+headers=headers||parser.headers;
 
 assert.equal(headers.length,2*256);// 256 key/value pairs
 for(vari=0;i<headers.length;i+=2){