Skip to content

Commit

Permalink
fix: ignore all unrelated messages from child process (#13543)
Browse files Browse the repository at this point in the history
  • Loading branch information
LinusU committed Feb 3, 2023
1 parent 485d8fb commit 48ddbf4
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -6,6 +6,7 @@

- `[expect, @jest/expect]` Provide type of `actual` as a generic argument to `Matchers` to allow better-typed extensions ([#13848](https://github.com/facebook/jest/pull/13848))
- `[jest-circus]` Added explicit mention of test failing because `done()` is not being called in error message ([#13847](https://github.com/facebook/jest/pull/13847))
- `[jest-worker]` Ignore IPC messages not intended for Jest ([#13543](https://github.com/facebook/jest/pull/13543))

### Chore & Maintenance

Expand Down
6 changes: 5 additions & 1 deletion packages/jest-worker/src/workers/ChildProcessWorker.ts
Expand Up @@ -255,6 +255,9 @@ export default class ChildProcessWorker
}

private _onMessage(response: ParentMessage) {
// Ignore messages not intended for us
if (!Array.isArray(response)) return;

// TODO: Add appropriate type check
let error: any;

Expand Down Expand Up @@ -311,7 +314,8 @@ export default class ChildProcessWorker
break;

default:
throw new TypeError(`Unexpected response from worker: ${response[0]}`);
// Ignore messages not intended for us
break;
}
}

Expand Down
6 changes: 5 additions & 1 deletion packages/jest-worker/src/workers/NodeThreadsWorker.ts
Expand Up @@ -170,6 +170,9 @@ export default class ExperimentalWorker
}

private _onMessage(response: ParentMessage) {
// Ignore messages not intended for us
if (!Array.isArray(response)) return;

let error;

switch (response[0]) {
Expand Down Expand Up @@ -227,7 +230,8 @@ export default class ExperimentalWorker
break;

default:
throw new TypeError(`Unexpected response from worker: ${response[0]}`);
// Ignore messages not intended for us
break;
}
}

Expand Down
Expand Up @@ -363,7 +363,7 @@ it('creates error instances for known errors', () => {
expect(callback3.mock.calls[0][0]).toBe(412);
});

it('throws when the child process returns a strange message', () => {
it('does not throw when the child process returns a strange message', () => {
const worker = new Worker({
forkOptions: {},
maxRetries: 3,
Expand All @@ -378,9 +378,14 @@ it('throws when the child process returns a strange message', () => {
);

// Type 27 does not exist.
expect(() => {
forkInterface.emit('message', [27]);
}).toThrow(TypeError);
forkInterface.emit('message', [27]);

forkInterface.emit('message', 'test');
forkInterface.emit('message', {foo: 'bar'});
forkInterface.emit('message', 0);
forkInterface.emit('message', null);
forkInterface.emit('message', Symbol('test'));
forkInterface.emit('message', true);
});

it('does not restart the child if it cleanly exited', () => {
Expand Down
Expand Up @@ -365,7 +365,7 @@ it('creates error instances for known errors', () => {
expect(callback3.mock.calls[0][0]).toBe(412);
});

it('throws when the thread returns a strange message', () => {
it('does not throw when the thread returns a strange message', () => {
const worker = new Worker({
forkOptions: {},
maxRetries: 3,
Expand All @@ -380,10 +380,26 @@ it('throws when the thread returns a strange message', () => {
);

// Type 27 does not exist.
expect(() => {
// @ts-expect-error: Testing internal method
worker._worker.emit('message', [27]);
}).toThrow(TypeError);
// @ts-expect-error: Testing internal method
worker._worker.emit('message', [27]);

// @ts-expect-error: Testing internal method
worker._worker.emit('message', 'test');

// @ts-expect-error: Testing internal method
worker._worker.emit('message', {foo: 'bar'});

// @ts-expect-error: Testing internal method
worker._worker.emit('message', 0);

// @ts-expect-error: Testing internal method
worker._worker.emit('message', null);

// @ts-expect-error: Testing internal method
worker._worker.emit('message', Symbol('test'));

// @ts-expect-error: Testing internal method
worker._worker.emit('message', true);
});

it('does not restart the thread if it cleanly exited', () => {
Expand Down

0 comments on commit 48ddbf4

Please sign in to comment.