Skip to content

Commit 8d39481

Browse files
santigimenojasnell
authored andcommitted
test: fix test-cluster-worker-kill
Don't check that the `disconnect` event is emitted before the `exit` event as the order is not guaranteed. PR-URL: #5814 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 74a703d commit 8d39481

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

test/parallel/test-cluster-worker-kill.js

+3-20
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ if (cluster.isWorker) {
6060
results.cluster_exitCode = worker.process.exitCode;
6161
results.cluster_signalCode = worker.process.signalCode;
6262
results.cluster_emitExit += 1;
63-
assert.ok(results.cluster_emitDisconnect,
64-
"cluster: 'exit' event before 'disconnect' event");
6563
});
6664

6765
// Check worker events and properties
@@ -77,26 +75,11 @@ if (cluster.isWorker) {
7775
results.worker_signalCode = signalCode;
7876
results.worker_emitExit += 1;
7977
results.worker_died = !alive(worker.process.pid);
80-
assert.ok(results.worker_emitDisconnect,
81-
"worker: 'exit' event before 'disconnect' event");
82-
83-
process.nextTick(function() { finish_test(); });
8478
});
8579

86-
var finish_test = function() {
87-
try {
88-
checkResults(expected_results, results);
89-
} catch (exc) {
90-
console.error('FAIL: ' + exc.message);
91-
if (exc.name != 'AssertionError') {
92-
console.trace(exc);
93-
}
94-
95-
process.exit(1);
96-
return;
97-
}
98-
process.exit(0);
99-
};
80+
process.on('exit', function() {
81+
checkResults(expected_results, results);
82+
});
10083
}
10184

10285
// some helper functions ...

0 commit comments

Comments
 (0)