Skip to content

Commit 048cbe3

Browse files
lpincamarco-ippolito
authored andcommitted
test: remove timers from test-tls-socket-close
Fixes: #49902 PR-URL: #53019 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 61b1f57 commit 048cbe3

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

test/parallel/test-tls-socket-close.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ const cert = fixtures.readKey('agent2-cert.pem');
1515
let serverTlsSocket;
1616
const tlsServer = tls.createServer({ cert, key }, (socket) => {
1717
serverTlsSocket = socket;
18+
socket.on('data', (chunk) => {
19+
assert.strictEqual(chunk[0], 46);
20+
socket.write('.');
21+
});
1822
socket.on('close', dec);
1923
});
2024

@@ -25,10 +29,10 @@ let netSocketCloseEmitted = false;
2529
const netServer = net.createServer((socket) => {
2630
netSocket = socket;
2731
tlsServer.emit('connection', socket);
28-
socket.on('close', () => {
32+
socket.on('close', common.mustCall(() => {
2933
netSocketCloseEmitted = true;
3034
assert.strictEqual(serverTlsSocket.destroyed, true);
31-
});
35+
}));
3236
}).listen(0, common.mustCall(() => {
3337
connectClient(netServer);
3438
}));
@@ -45,24 +49,20 @@ function connectClient(server) {
4549
rejectUnauthorized: false
4650
});
4751

48-
clientTlsSocket.write('foo', 'utf8', common.mustCall(() => {
49-
assert(netSocket);
50-
netSocket.setTimeout(common.platformTimeout(10), common.mustCall(() => {
51-
assert(serverTlsSocket);
52+
clientTlsSocket.write('.');
5253

53-
netSocket.destroy();
54-
assert.strictEqual(netSocket.destroyed, true);
54+
clientTlsSocket.on('data', (chunk) => {
55+
assert.strictEqual(chunk[0], 46);
5556

56-
setImmediate(() => {
57-
// Close callbacks are executed after `setImmediate()` callbacks.
58-
assert.strictEqual(netSocketCloseEmitted, false);
59-
assert.strictEqual(serverTlsSocket.destroyed, false);
60-
setImmediate(() => {
61-
assert.strictEqual(netSocketCloseEmitted, true);
62-
});
63-
});
64-
}));
65-
}));
57+
netSocket.destroy();
58+
assert.strictEqual(netSocket.destroyed, true);
59+
60+
setImmediate(() => {
61+
// Close callbacks are executed after `setImmediate()` callbacks.
62+
assert.strictEqual(netSocketCloseEmitted, false);
63+
assert.strictEqual(serverTlsSocket.destroyed, false);
64+
});
65+
});
6666

6767
clientTlsSocket.on('close', dec);
6868
}

0 commit comments

Comments
 (0)