Skip to content
This repository has been archived by the owner on Oct 16, 2021. It is now read-only.

Commit

Permalink
test: fix test-cluster-worker-kill
Browse files Browse the repository at this point in the history
cherry-pick following from master

commit 8d39481
Author: Santiago Gimeno <santiago.gimeno@gmail.com>
Date:   Sun Mar 20 21:11:36 2016 +0100

    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: nodejs/node#5814
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
jBarz committed Feb 19, 2017
1 parent 7757ef9 commit dae313d
Showing 1 changed file with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions test/simple/test-cluster-worker-kill.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ if (cluster.isWorker) {
results.cluster_exitCode = worker.process.exitCode;
results.cluster_signalCode = worker.process.signalCode;
results.cluster_emitExit += 1;
assert.ok(results.cluster_emitDisconnect,
"cluster: 'exit' event before 'disconnect' event");
});

// Check worker events and properties
Expand All @@ -96,26 +94,12 @@ if (cluster.isWorker) {
results.worker_signalCode = signalCode;
results.worker_emitExit += 1;
results.worker_died = !alive(worker.process.pid);
assert.ok(results.worker_emitDisconnect,
"worker: 'exit' event before 'disconnect' event");

process.nextTick(function() { finish_test(); });
});

var finish_test = function() {
try {
checkResults(expected_results, results);
} catch (exc) {
console.error('FAIL: ' + exc.message);
if (exc.name != 'AssertionError') {
console.trace(exc);
}
process.on('exit', function() {
checkResults(expected_results, results);
});

process.exit(1);
return;
}
process.exit(0);
};
}

// some helper functions ...
Expand Down

0 comments on commit dae313d

Please sign in to comment.