summaryrefslogtreecommitdiff
path: root/test/parallel/test-https-set-timeout-server.js
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2016-07-15 15:43:24 -0400
committerEvan Lucas <evanlucas@me.com>2016-07-20 06:42:36 -0500
commit9e9d499b8be8ffc6050db25129b042507d7b4b02 (patch)
treee1db43cd5858a1af80f75981d8cd8600b0356cce /test/parallel/test-https-set-timeout-server.js
parentcf8a4889db1515c510e92d71830f7def9b940565 (diff)
downloadnode-new-9e9d499b8be8ffc6050db25129b042507d7b4b02.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> Conflicts: test/parallel/test-file-read-noexist.js
Diffstat (limited to 'test/parallel/test-https-set-timeout-server.js')
-rw-r--r--test/parallel/test-https-set-timeout-server.js90
1 files changed, 29 insertions, 61 deletions
diff --git a/test/parallel/test-https-set-timeout-server.js b/test/parallel/test-https-set-timeout-server.js
index 298ec51587..fd00a521a0 100644
--- a/test/parallel/test-https-set-timeout-server.js
+++ b/test/parallel/test-https-set-timeout-server.js
@@ -35,42 +35,34 @@ function run() {
}
test(function serverTimeout(cb) {
- var caughtTimeout = false;
- process.on('exit', function() {
- assert(caughtTimeout);
- });
var server = https.createServer(serverOptions, function(req, res) {
// just do nothing, we should get a timeout event.
});
- server.listen(0, function() {
- var s = server.setTimeout(50, function(socket) {
- caughtTimeout = true;
+ server.listen(0, common.mustCall(function() {
+ var s = server.setTimeout(50, common.mustCall(function(socket) {
socket.destroy();
server.close();
cb();
- });
+ }));
assert.ok(s instanceof https.Server);
https.get({
port: this.address().port,
rejectUnauthorized: false
}).on('error', function() {});
- });
+ }));
});
test(function serverRequestTimeout(cb) {
- var caughtTimeout = false;
- process.on('exit', function() {
- assert(caughtTimeout);
- });
- var server = https.createServer(serverOptions, function(req, res) {
+ function handler(req, res) {
// just do nothing, we should get a timeout event.
- req.setTimeout(50, function() {
- caughtTimeout = true;
+ req.setTimeout(50, common.mustCall(function() {
req.socket.destroy();
server.close();
cb();
- });
- });
+ }));
+ }
+
+ var server = https.createServer(serverOptions, common.mustCall(handler));
server.listen(0, function() {
var req = https.request({
port: this.address().port,
@@ -84,19 +76,16 @@ test(function serverRequestTimeout(cb) {
});
test(function serverResponseTimeout(cb) {
- var caughtTimeout = false;
- process.on('exit', function() {
- assert(caughtTimeout);
- });
- var server = https.createServer(serverOptions, function(req, res) {
+ function handler(req, res) {
// just do nothing, we should get a timeout event.
- res.setTimeout(50, function() {
- caughtTimeout = true;
+ res.setTimeout(50, common.mustCall(function() {
res.socket.destroy();
server.close();
cb();
- });
- });
+ }));
+ }
+
+ var server = https.createServer(serverOptions, common.mustCall(handler));
server.listen(0, function() {
https.get({
port: this.address().port,
@@ -106,21 +95,12 @@ test(function serverResponseTimeout(cb) {
});
test(function serverRequestNotTimeoutAfterEnd(cb) {
- var caughtTimeoutOnRequest = false;
- var caughtTimeoutOnResponse = false;
- process.on('exit', function() {
- assert(!caughtTimeoutOnRequest);
- assert(caughtTimeoutOnResponse);
- });
- var server = https.createServer(serverOptions, function(req, res) {
+ function handler(req, res) {
// just do nothing, we should get a timeout event.
- req.setTimeout(50, function(socket) {
- caughtTimeoutOnRequest = true;
- });
- res.on('timeout', function(socket) {
- caughtTimeoutOnResponse = true;
- });
- });
+ req.setTimeout(50, common.fail);
+ res.on('timeout', common.mustCall(function(socket) {}));
+ }
+ var server = https.createServer(serverOptions, common.mustCall(handler));
server.on('timeout', function(socket) {
socket.destroy();
server.close();
@@ -165,29 +145,17 @@ test(function serverResponseTimeoutWithPipeline(cb) {
});
test(function idleTimeout(cb) {
- var caughtTimeoutOnRequest = false;
- var caughtTimeoutOnResponse = false;
- var caughtTimeoutOnServer = false;
- process.on('exit', function() {
- assert(!caughtTimeoutOnRequest);
- assert(!caughtTimeoutOnResponse);
- assert(caughtTimeoutOnServer);
- });
- var server = https.createServer(serverOptions, function(req, res) {
- req.on('timeout', function(socket) {
- caughtTimeoutOnRequest = true;
- });
- res.on('timeout', function(socket) {
- caughtTimeoutOnResponse = true;
- });
- res.end();
- });
- server.setTimeout(50, function(socket) {
- caughtTimeoutOnServer = true;
+ var server = https.createServer(serverOptions,
+ common.mustCall(function(req, res) {
+ req.on('timeout', common.fail);
+ res.on('timeout', common.fail);
+ res.end();
+ }));
+ server.setTimeout(50, common.mustCall(function(socket) {
socket.destroy();
server.close();
cb();
- });
+ }));
server.listen(0, function() {
var options = {
port: this.address().port,