Skip to content

Commit

Permalink
test: refactor test-http-expect-continue
Browse files Browse the repository at this point in the history
Use common.mustCall() where appropriate. Remove some logic that is not
required when common.mustCall() is used (incrementor/decrementor to make
sure everything is called the same number of times).

PR-URL: #19625
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Trott authored and BethGriggs committed Dec 4, 2018
1 parent 8afbd5c commit 8a0ecf4
Showing 1 changed file with 20 additions and 27 deletions.
47 changes: 20 additions & 27 deletions test/parallel/test-http-expect-continue.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,70 +20,63 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.

'use strict';
require('../common');
const common = require('../common');
const assert = require('assert');
const http = require('http');

let outstanding_reqs = 0;
const test_req_body = 'some stuff...\n';
const test_res_body = 'other stuff!\n';
let sent_continue = false;
let got_continue = false;

function handler(req, res) {
assert.strictEqual(sent_continue, true,
'Full response sent before 100 Continue');
const handler = common.mustCall((req, res) => {
assert.ok(sent_continue, 'Full response sent before 100 Continue');
console.error('Server sending full response...');
res.writeHead(200, {
'Content-Type': 'text/plain',
'ABCD': '1'
});
res.end(test_res_body);
}
});

const server = http.createServer(handler);
server.on('checkContinue', function(req, res) {
const server = http.createServer();
server.on('checkContinue', common.mustCall((req, res) => {
console.error('Server got Expect: 100-continue...');
res.writeContinue();
sent_continue = true;
setTimeout(function() {
handler(req, res);
}, 100);
});
}));
server.listen(0);


server.on('listening', function() {
server.on('listening', common.mustCall(() => {
const req = http.request({
port: this.address().port,
port: server.address().port,
method: 'POST',
path: '/world',
headers: { 'Expect': '100-continue' }
});
console.error('Client sending request...');
outstanding_reqs++;
let body = '';
req.on('continue', function() {
req.on('continue', common.mustCall(() => {
console.error('Client got 100 Continue...');
got_continue = true;
req.end(test_req_body);
});
req.on('response', function(res) {
assert.strictEqual(got_continue, true,
'Full response received before 100 Continue');
}));
req.on('response', common.mustCall((res) => {
assert.ok(got_continue, 'Full response received before 100 Continue');
assert.strictEqual(200, res.statusCode,
`Final status code was ${res.statusCode}, not 200.`);
res.setEncoding('utf8');
res.on('data', function(chunk) { body += chunk; });
res.on('end', function() {
res.on('end', common.mustCall(() => {
console.error('Got full response.');
assert.strictEqual(body, test_res_body, 'Response body doesn\'t match.');
assert.strictEqual(body, test_res_body);
assert.ok('abcd' in res.headers, 'Response headers missing.');
outstanding_reqs--;
if (outstanding_reqs === 0) {
server.close();
process.exit();
}
});
});
});
server.close();
process.exit();
}));
}));
}));

0 comments on commit 8a0ecf4

Please sign in to comment.