Skip to content

Commit

Permalink
test: fix flaky test-repl-sigint-nested-eval
Browse files Browse the repository at this point in the history
There is a race condition where process.kill can be sent before the
target is ready to receive the signal.

Fixes: #41123
PR-URL: #45354
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
  • Loading branch information
Trott authored and danielleadams committed Jan 3, 2023
1 parent 32a3859 commit 4283af4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 0 additions & 2 deletions test/parallel/parallel.status
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ prefix parallel
# sample-test : PASS,FLAKY

[true] # This section applies to all platforms
# https://github.com/nodejs/node/issues/41123
test-repl-sigint-nested-eval: PASS, FLAKY
# https://github.com/nodejs/node/issues/43084
test-worker-http2-stream-terminate: PASS, FLAKY

Expand Down
13 changes: 7 additions & 6 deletions test/parallel/test-repl-sigint-nested-eval.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ if (!common.isMainThread)
const assert = require('assert');
const spawn = require('child_process').spawn;

process.env.REPL_TEST_PPID = process.pid;
const child = spawn(process.execPath, [ '-i' ], {
stdio: [null, null, 2]
stdio: [null, null, 2, 'ipc']
});

let stdout = '';
Expand All @@ -22,17 +21,19 @@ child.stdout.on('data', function(c) {
});

child.stdout.once('data', common.mustCall(() => {
process.on('SIGUSR2', common.mustCall(() => {
child.on('message', common.mustCall((msg) => {
assert.strictEqual(msg, 'repl is busy');
process.kill(child.pid, 'SIGINT');
child.stdout.once('data', common.mustCall(() => {
// Make sure REPL still works.
child.stdin.end('"foobar"\n');
}));
}));

child.stdin.write('process.kill(+process.env.REPL_TEST_PPID, "SIGUSR2");' +
'vm.runInThisContext("while(true){}", ' +
'{ breakOnSigint: true });\n');
child.stdin.write(
'vm.runInThisContext("process.send(\'repl is busy\'); while(true){}", ' +
'{ breakOnSigint: true });\n'
);
}));

child.on('close', function(code) {
Expand Down

0 comments on commit 4283af4

Please sign in to comment.