1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix redeclared test-http-* vars

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/4987
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
This commit is contained in:
Rich Trott 2016-01-30 20:43:11 -08:00 committed by Roman Klauke
parent 754bcff73e
commit 463aa196cc
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/parallel/test-http-dns-error.js
View File

@ -10,9 +10,6 @@ if (common.hasCrypto) {
console.log('1..0 # Skipped: missing crypto');
}
var expected_bad_requests = 0;
var actual_bad_requests = 0;
var host = '********';
host += host;
host += host;
@ -25,23 +22,20 @@ function do_not_call() {
}
function test(mod) {
expected_bad_requests += 2;
// Bad host name should not throw an uncatchable exception.
// Ensure that there is time to attach an error listener.
var req = mod.get({host: host, port: 42}, do_not_call);
req.on('error', function(err) {
var req1 = 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
var req = mod.request({method: 'GET', host: host, port: 42}, do_not_call);
req.on('error', function(err) {
var req2 = 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);
});

4
test/parallel/test-http-full-response.js
View File

@ -37,10 +37,10 @@ function runAb(opts, callback) {
var m = /Document Length:\s*(\d+) bytes/mi.exec(stdout);
var documentLength = parseInt(m[1]);
var m = /Complete requests:\s*(\d+)/mi.exec(stdout);
m = /Complete requests:\s*(\d+)/mi.exec(stdout);
var completeRequests = parseInt(m[1]);
var m = /HTML transferred:\s*(\d+) bytes/mi.exec(stdout);
m = /HTML transferred:\s*(\d+) bytes/mi.exec(stdout);
var htmlTransfered = parseInt(m[1]);
assert.equal(bodyLength, documentLength);

2
test/parallel/test-http-parser.js
View File

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