Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: fix "crash cases" tests not failing properly #37325

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions spec/crash-spec.ts
Expand Up @@ -8,7 +8,7 @@ const fixturePath = path.resolve(__dirname, 'fixtures', 'crash-cases');

let children: cp.ChildProcessWithoutNullStreams[] = [];

const runFixtureAndEnsureCleanExit = (args: string[]) => {
const runFixtureAndEnsureCleanExit = async (args: string[]) => {
let out = '';
const child = cp.spawn(process.execPath, args);
children.push(child);
Expand All @@ -18,17 +18,20 @@ const runFixtureAndEnsureCleanExit = (args: string[]) => {
child.stderr.on('data', (chunk: Buffer) => {
out += chunk.toString();
});
return new Promise<void>((resolve) => {

type CodeAndSignal = {code: number | null, signal: NodeJS.Signals | null};
const { code, signal } = await new Promise<CodeAndSignal>((resolve) => {
child.on('exit', (code, signal) => {
if (code !== 0 || signal !== null) {
console.error(out);
}
expect(signal).to.equal(null, 'exit signal should be null');
expect(code).to.equal(0, 'should have exited with code 0');
children = children.filter(c => c !== child);
resolve();
resolve({ code, signal });
});
});
if (code !== 0 || signal !== null) {
console.error(out);
}
children = children.filter(c => c !== child);

expect(signal).to.equal(null, 'exit signal should be null');
expect(code).to.equal(0, 'should have exited with code 0');
};

const shouldRunCase = (crashCase: string) => {
Expand Down
6 changes: 3 additions & 3 deletions spec/modules-spec.ts
Expand Up @@ -62,10 +62,10 @@ describe('modules support', () => {

ifit(features.isRunAsNodeEnabled())('can be required in node binary', async function () {
const child = childProcess.fork(path.join(fixtures, 'module', 'uv-dlopen.js'));
await new Promise<void>(resolve => child.once('exit', (exitCode) => {
expect(exitCode).to.equal(0);
resolve();
const exitCode = await new Promise<number | null>(resolve => child.once('exit', (exitCode) => {
resolve(exitCode);
}));
expect(exitCode).to.equal(0);
});
});

Expand Down