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.

Sign up for GitHub

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

Jump to bottom

Fix randomly failing CI tests #231

Merged
merged 3 commits into from May 10, 2019
Merged

Fix randomly failing CI tests #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea2533e
Simplify tests
ehmicky May 10, 2019
470a8a6
Remove redundant test
ehmicky May 10, 2019
5531995
Fix timeout tests
ehmicky May 10, 2019
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
7 changes: 1 addition & 6 deletions fixtures/delay
View file
Open in desktop
@@ -1,9 +1,4 @@
#!/usr/bin/env node
'use strict';

setTimeout(() => {
console.log('delay completed');
process.exit(Number(process.argv[3] || 0));
}, Number(process.argv[2]));

console.log('delay started');
setTimeout(() => {}, Number(process.argv[2]));
4 changes: 0 additions & 4 deletions fixtures/sleeper
View file
Open in desktop

This file was deleted.

54 changes: 12 additions & 42 deletions test.js
View file
Open in desktop
Expand Up @@ -322,9 +322,7 @@ if (process.platform !== 'win32') {
test('error.killed is true if process was killed directly', async t => {
const cp = execa('forever');

setTimeout(() => {
cp.kill();
}, 100);
cp.kill();

const error = await t.throwsAsync(cp, {message: /was killed with SIGTERM/});
t.true(error.killed);
Expand All @@ -334,9 +332,7 @@ test('error.killed is true if process was killed directly', async t => {
test('error.killed is false if process was killed indirectly', async t => {
const cp = execa('forever');

setTimeout(() => {
process.kill(cp.pid, 'SIGINT');
}, 100);
process.kill(cp.pid, 'SIGINT');

// `process.kill()` is emulated by Node.js on Windows
const message = process.platform === 'win32' ? /failed with exit code 1/ : /was killed with SIGINT/;
Expand All @@ -352,19 +348,15 @@ if (process.platform === 'darwin') {
t.end();
});

setTimeout(() => {
process.kill(cp.pid, 'SIGINT');
}, 100);
process.kill(cp.pid, 'SIGINT');
});
}

if (process.platform !== 'win32') {
test('error.signal is SIGINT', async t => {
const cp = execa('forever');

setTimeout(() => {
process.kill(cp.pid, 'SIGINT');
}, 100);
process.kill(cp.pid, 'SIGINT');

const error = await t.throwsAsync(cp, {message: /was killed with SIGINT/});
t.is(error.signal, 'SIGINT');
Expand All @@ -373,16 +365,14 @@ if (process.platform !== 'win32') {
test('error.signal is SIGTERM', async t => {
const cp = execa('forever');

setTimeout(() => {
process.kill(cp.pid, 'SIGTERM');
}, 100);
process.kill(cp.pid, 'SIGTERM');

const error = await t.throwsAsync(cp, {message: /was killed with SIGTERM/});
t.is(error.signal, 'SIGTERM');
});

test('custom error.signal', async t => {
const error = await t.throwsAsync(execa('delay', ['3000', '0'], {killSignal: 'SIGHUP', timeout: 1500, message: TIMEOUT_REGEXP}));
const error = await t.throwsAsync(execa('forever', {killSignal: 'SIGHUP', timeout: 1, message: TIMEOUT_REGEXP}));
t.is(error.signal, 'SIGHUP');
});
}
Expand All @@ -405,41 +395,21 @@ test('error.code is 2', code, 2);
test('error.code is 3', code, 3);
test('error.code is 4', code, 4);

test.serial('timeout will kill the process early', async t => {
const time = Date.now();
const error = await t.throwsAsync(execa('delay', ['60000', '0'], {timeout: 500, message: TIMEOUT_REGEXP}));
const diff = Date.now() - time;

t.true(error.timedOut);
t.not(error.exitCode, 22);
t.true(diff < 4000);
});

test.serial('timeout will kill the process early (sleep)', async t => {
const time = Date.now();
const error = await t.throwsAsync(execa('sleeper', [], {timeout: 500, message: TIMEOUT_REGEXP}));
const diff = Date.now() - time;

test('timeout kills the process if it times out', async t => {
const error = await t.throwsAsync(execa('forever', {timeout: 1, message: TIMEOUT_REGEXP}));
t.true(error.timedOut);
t.not(error.stdout, 'ok');
t.true(diff < 4000);
});

test('timeout will not kill the process early', async t => {
const error = await t.throwsAsync(execa('delay', ['2000', '22'], {timeout: 30000}), {code: 22, message: getExitRegExp('22')});
test('timeout does not kill the process if it does not time out', async t => {
const error = await execa('delay', ['500'], {timeout: 1e8});
t.false(error.timedOut);
});

test('timedOut will be false if no timeout was set and zero exit code', async t => {
const result = await execa('delay', ['1000', '0']);
test('timedOut is false if no timeout was set', async t => {
const result = await execa('noop');
t.false(result.timedOut);
});

test('timedOut will be false if no timeout was set and non-zero exit code', async t => {
const error = await t.throwsAsync(execa('delay', ['1000', '3']), {message: getExitRegExp('3')});
t.false(error.timedOut);
});

async function errorMessage(t, expected, ...args) {
await t.throwsAsync(execa('exit', args), {message: expected});
}
Expand Down