Skip to content

Commit

Permalink
child_process: treat already-aborted controller as aborting
Browse files Browse the repository at this point in the history
If an AbortController passed to execfile() is already aborted, use the
same behavior as if the controller was aborted after calling execfile().
This mimics the behavior of fetch in the browser.

PR-URL: #36644
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
  • Loading branch information
Trott authored and danielleadams committed Jan 12, 2021
1 parent d5d56ec commit 78d4d91
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
2 changes: 2 additions & 0 deletions lib/child_process.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,8 @@ function execFile(file /* , args, options, callback */) {
}
if (options.signal) {
if (options.signal.aborted) {
if (!ex)
ex = new AbortError();
process.nextTick(() => kill());
} else {
const childController = new AbortController();
Expand Down
28 changes: 11 additions & 17 deletions test/parallel/test-child-process-execfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,19 @@ const execOpts = { encoding: 'utf8', shell: true };
const ac = new AbortController();
const { signal } = ac;

const firstCheck = common.mustCall((err) => {
assert.strictEqual(err.code, 'ABORT_ERR');
assert.strictEqual(err.name, 'AbortError');
assert.strictEqual(err.signal, undefined);
});

const secondCheck = common.mustCall((err) => {
assert.strictEqual(err.code, null);
assert.strictEqual(err.name, 'Error');
assert.strictEqual(err.signal, 'SIGTERM');
});

execFile(process.execPath, [echoFixture, 0], { signal }, (err) => {
firstCheck(err);
// Test that re-using the aborted signal results in immediate SIGTERM.
execFile(process.execPath, [echoFixture, 0], { signal }, secondCheck);
});
const test = () => {
const check = common.mustCall((err) => {
assert.strictEqual(err.code, 'ABORT_ERR');
assert.strictEqual(err.name, 'AbortError');
assert.strictEqual(err.signal, undefined);
});
execFile(process.execPath, [echoFixture, 0], { signal }, check);
};

test();
ac.abort();
// Verify that it still works the same way now that the signal is aborted.
test();
}

{
Expand Down

0 comments on commit 78d4d91

Please sign in to comment.