diff options
author | cjihrig <cjihrig@gmail.com> | 2016-07-15 15:43:24 -0400 |
---|---|---|
committer | cjihrig <cjihrig@gmail.com> | 2016-07-18 17:14:16 -0400 |
commit | 04b4d15b396a7befea31dbfec89f69ff71dc71ca (patch) | |
tree | 7819010b9b687fb20328c04645e9ec64c25b9328 /test/parallel/test-http-agent-no-protocol.js | |
parent | 59741a9beeb0ccaac6fc3247605bf090d36ad50e (diff) | |
download | node-new-04b4d15b396a7befea31dbfec89f69ff71dc71ca.tar.gz |
test: use mustCall() for simple flow tracking
Many of the tests use variables to track when callback functions
are invoked or events are emitted. These variables are then
asserted on process exit. This commit replaces this pattern in
straightforward cases with common.mustCall(). This makes the
tests easier to reason about, leads to a net reduction in lines
of code, and uncovered a few bugs in tests. This commit also
replaces some callbacks that should never be called with
common.fail().
PR-URL: https://github.com/nodejs/node/pull/7753
Reviewed-By: Wyatt Preul <wpreul@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'test/parallel/test-http-agent-no-protocol.js')
-rw-r--r-- | test/parallel/test-http-agent-no-protocol.js | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/test/parallel/test-http-agent-no-protocol.js b/test/parallel/test-http-agent-no-protocol.js index 0feb4d9fcf..94fd525b90 100644 --- a/test/parallel/test-http-agent-no-protocol.js +++ b/test/parallel/test-http-agent-no-protocol.js @@ -1,20 +1,11 @@ 'use strict'; -require('../common'); -var assert = require('assert'); +const common = require('../common'); var http = require('http'); var url = require('url'); -var request = 0; -var response = 0; -process.on('exit', function() { - assert.equal(1, request, 'http server "request" callback was not called'); - assert.equal(1, response, 'http client "response" callback was not called'); -}); - -var server = http.createServer(function(req, res) { +var server = http.createServer(common.mustCall(function(req, res) { res.end(); - request++; -}).listen(0, '127.0.0.1', function() { +})).listen(0, '127.0.0.1', common.mustCall(function() { var opts = url.parse(`http://127.0.0.1:${this.address().port}/`); // remove the `protocol` field… the `http` module should fall back @@ -22,9 +13,8 @@ var server = http.createServer(function(req, res) { opts.agent = new http.Agent(); opts.agent.protocol = null; - http.get(opts, function(res) { - response++; + http.get(opts, common.mustCall(function(res) { res.resume(); server.close(); - }); -}); + })); +})); |