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

test: improve code in test-http-host-headers

Browse Source 
* use common.fail to handle errors
* remove console.log
* use arrow functions

PR-URL: https://github.com/nodejs/node/pull/10830
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Adrian Estrada 2017-01-15 22:23:19 -05:00 committed by James M Snell
parent f3f2468bdc
commit f4fd073f0f
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/parallel/test-http-host-headers.js
View File

@ -1,11 +1,10 @@
'use strict'; 'use strict';
require('../common'); const common = require('../common');
const http = require('http'); const http = require('http');
const assert = require('assert'); const assert = require('assert');
const httpServer = http.createServer(reqHandler); const httpServer = http.createServer(reqHandler);
function reqHandler(req, res) { function reqHandler(req, res) {
console.log('Got request: ' + req.headers.host + ' ' + req.url);
if (req.url === '/setHostFalse5') { if (req.url === '/setHostFalse5') {
assert.strictEqual(req.headers.host, undefined); assert.strictEqual(req.headers.host, undefined);
} else { } else {
@ -14,14 +13,9 @@ function reqHandler(req, res) {
req.headers.host); req.headers.host);
} }
res.writeHead(200, {}); res.writeHead(200, {});
//process.nextTick(function() { res.end('ok'); });
res.end('ok'); res.end('ok');
} }
function thrower(er) {
throw er;
}
testHttp(); testHttp();
function testHttp() { function testHttp() {
@ -30,59 +24,52 @@ function testHttp() {
function cb(res) { function cb(res) {
counter--; counter--;
console.log('back from http request. counter = ' + counter);
if (counter === 0) { if (counter === 0) {
httpServer.close(); httpServer.close();
} }
res.resume(); res.resume();
} }
httpServer.listen(0, function(er) { httpServer.listen(0, (er) => {
console.error(`test http server listening on ${this.address().port}`);
assert.ifError(er); assert.ifError(er);
http.get({ http.get({
method: 'GET', method: 'GET',
path: '/' + (counter++), path: '/' + (counter++),
host: 'localhost', host: 'localhost',
//agent: false, port: httpServer.address().port,
port: this.address().port,
rejectUnauthorized: false rejectUnauthorized: false
}, cb).on('error', thrower); }, cb).on('error', common.fail);
http.request({ http.request({
method: 'GET', method: 'GET',
path: '/' + (counter++), path: '/' + (counter++),
host: 'localhost', host: 'localhost',
//agent: false, port: httpServer.address().port,
port: this.address().port,
rejectUnauthorized: false rejectUnauthorized: false
}, cb).on('error', thrower).end(); }, cb).on('error', common.fail).end();
http.request({ http.request({
method: 'POST', method: 'POST',
path: '/' + (counter++), path: '/' + (counter++),
host: 'localhost', host: 'localhost',
//agent: false, port: httpServer.address().port,
port: this.address().port,
rejectUnauthorized: false rejectUnauthorized: false
}, cb).on('error', thrower).end(); }, cb).on('error', common.fail).end();
http.request({ http.request({
method: 'PUT', method: 'PUT',
path: '/' + (counter++), path: '/' + (counter++),
host: 'localhost', host: 'localhost',
//agent: false, port: httpServer.address().port,
port: this.address().port,
rejectUnauthorized: false rejectUnauthorized: false
}, cb).on('error', thrower).end(); }, cb).on('error', common.fail).end();
http.request({ http.request({
method: 'DELETE', method: 'DELETE',
path: '/' + (counter++), path: '/' + (counter++),
host: 'localhost', host: 'localhost',
//agent: false, port: httpServer.address().port,
port: this.address().port,
rejectUnauthorized: false rejectUnauthorized: false
}, cb).on('error', thrower).end(); }, cb).on('error', common.fail).end();
}); });
} }