Skip to content

Commit f8c2302

Browse files
Suixinleiaddaleax
authored andcommitted
test: use common.mustCall() instead of exit handle
PR-URL: #14262 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 4836f3b commit f8c2302

File tree

2 files changed

+9
-31
lines changed

2 files changed

+9
-31
lines changed

test/parallel/test-http-server-keep-alive-timeout.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const common = require('../common');
4-
const assert = require('assert');
54
const http = require('http');
65
const net = require('net');
76

@@ -20,14 +19,9 @@ function run() {
2019
}
2120

2221
test(function serverEndKeepAliveTimeoutWithPipeline(cb) {
23-
let requestCount = 0;
24-
process.on('exit', () => {
25-
assert.strictEqual(requestCount, 3);
26-
});
27-
const server = http.createServer((req, res) => {
28-
requestCount++;
22+
const server = http.createServer(common.mustCall((req, res) => {
2923
res.end();
30-
});
24+
}, 3));
3125
server.setTimeout(500, common.mustCall((socket) => {
3226
// End this test and call `run()` for the next test (if any).
3327
socket.destroy();
@@ -49,13 +43,7 @@ test(function serverEndKeepAliveTimeoutWithPipeline(cb) {
4943
});
5044

5145
test(function serverNoEndKeepAliveTimeoutWithPipeline(cb) {
52-
let requestCount = 0;
53-
process.on('exit', () => {
54-
assert.strictEqual(requestCount, 3);
55-
});
56-
const server = http.createServer((req, res) => {
57-
requestCount++;
58-
});
46+
const server = http.createServer(common.mustCall(3));
5947
server.setTimeout(500, common.mustCall((socket) => {
6048
// End this test and call `run()` for the next test (if any).
6149
socket.destroy();

test/parallel/test-https-server-keep-alive-timeout.js

+6-16
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const common = require('../common');
44
if (!common.hasCrypto)
55
common.skip('missing crypto');
66

7-
const assert = require('assert');
87
const https = require('https');
98
const tls = require('tls');
109
const fs = require('fs');
@@ -29,14 +28,11 @@ function run() {
2928
}
3029

3130
test(function serverKeepAliveTimeoutWithPipeline(cb) {
32-
let requestCount = 0;
33-
process.on('exit', function() {
34-
assert.strictEqual(requestCount, 3);
35-
});
36-
const server = https.createServer(serverOptions, (req, res) => {
37-
requestCount++;
38-
res.end();
39-
});
31+
const server = https.createServer(
32+
serverOptions,
33+
common.mustCall((req, res) => {
34+
res.end();
35+
}, 3));
4036
server.setTimeout(500, common.mustCall((socket) => {
4137
// End this test and call `run()` for the next test (if any).
4238
socket.destroy();
@@ -59,13 +55,7 @@ test(function serverKeepAliveTimeoutWithPipeline(cb) {
5955
});
6056

6157
test(function serverNoEndKeepAliveTimeoutWithPipeline(cb) {
62-
let requestCount = 0;
63-
process.on('exit', () => {
64-
assert.strictEqual(requestCount, 3);
65-
});
66-
const server = https.createServer(serverOptions, (req, res) => {
67-
requestCount++;
68-
});
58+
const server = https.createServer(serverOptions, common.mustCall(3));
6959
server.setTimeout(500, common.mustCall((socket) => {
7060
// End this test and call `run()` for the next test (if any).
7161
socket.destroy();

0 commit comments

Comments
 (0)