Skip to content

Commit

Permalink
test: improve code in test-http-host-headers
Browse files Browse the repository at this point in the history
* use common.fail to handle errors
* remove console.log
* use arrow functions

PR-URL: #10830
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
edsadr authored and jasnell committed Mar 8, 2017
1 parent d04c7ff commit 65b7200
Showing 1 changed file with 13 additions and 28 deletions.
41 changes: 13 additions & 28 deletions test/parallel/test-http-host-headers.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
'use strict';
require('../common');
const common = require('../common');
const http = require('http');
const assert = require('assert');
const httpServer = http.createServer(reqHandler);

function reqHandler(req, res) {
console.log('Got request: ' + req.headers.host + ' ' + req.url);
if (req.url === '/setHostFalse5') {
assert.equal(req.headers.host, undefined);
} else {
Expand All @@ -14,14 +13,9 @@ function reqHandler(req, res) {
req.headers.host);
}
res.writeHead(200, {});
//process.nextTick(function() { res.end('ok'); });
res.end('ok');
}

function thrower(er) {
throw er;
}

testHttp();

function testHttp() {
Expand All @@ -30,61 +24,52 @@ function testHttp() {

function cb(res) {
counter--;
console.log('back from http request. counter = ' + counter);
if (counter === 0) {
httpServer.close();
}
res.resume();
}

httpServer.listen(0, function(er) {
console.error(`test http server listening on ${this.address().port}`);

if (er) throw er;

httpServer.listen(0, (er) => {
assert.ifError(er);
http.get({
method: 'GET',
path: '/' + (counter++),
host: 'localhost',
//agent: false,
port: this.address().port,
port: httpServer.address().port,
rejectUnauthorized: false
}, cb).on('error', thrower);
}, cb).on('error', common.fail);

http.request({
method: 'GET',
path: '/' + (counter++),
host: 'localhost',
//agent: false,
port: this.address().port,
port: httpServer.address().port,
rejectUnauthorized: false
}, cb).on('error', thrower).end();
}, cb).on('error', common.fail).end();

http.request({
method: 'POST',
path: '/' + (counter++),
host: 'localhost',
//agent: false,
port: this.address().port,
port: httpServer.address().port,
rejectUnauthorized: false
}, cb).on('error', thrower).end();
}, cb).on('error', common.fail).end();

http.request({
method: 'PUT',
path: '/' + (counter++),
host: 'localhost',
//agent: false,
port: this.address().port,
port: httpServer.address().port,
rejectUnauthorized: false
}, cb).on('error', thrower).end();
}, cb).on('error', common.fail).end();

http.request({
method: 'DELETE',
path: '/' + (counter++),
host: 'localhost',
//agent: false,
port: this.address().port,
port: httpServer.address().port,
rejectUnauthorized: false
}, cb).on('error', thrower).end();
}, cb).on('error', common.fail).end();
});
}

0 comments on commit 65b7200

Please sign in to comment.