Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(testrunner): await terminations before reporting test results (#1855)

Browse source 
This way we ensure that all errors are picked up.
This commit is contained in:
Dmitry Gozman 2020-04-17 18:42:12 -07:00 committed by GitHub
parent 1912fbfe54
commit cf82e2c945
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
utils/testrunner/TestRunner.js
View file

@ -395,16 +395,17 @@ class TestRunner {
this._result = new Result(); this._result = new Result();
this._result.runs = testRuns; this._result.runs = testRuns;
const terminationPromises = [];
const handleSIGINT = () => this._terminate(TestResult.Terminated, 'SIGINT received', false, null); const handleSIGINT = () => this._terminate(TestResult.Terminated, 'SIGINT received', false, null);
const handleSIGHUP = () => this._terminate(TestResult.Terminated, 'SIGHUP received', false, null); const handleSIGHUP = () => this._terminate(TestResult.Terminated, 'SIGHUP received', false, null);
const handleSIGTERM = () => this._terminate(TestResult.Terminated, 'SIGTERM received', true, null); const handleSIGTERM = () => this._terminate(TestResult.Terminated, 'SIGTERM received', true, null);
const handleRejection = e => { const handleRejection = e => {
const { message, error } = this._toError('UNHANDLED PROMISE REJECTION', e); const { message, error } = this._toError('UNHANDLED PROMISE REJECTION', e);
this._terminate(TestResult.Crashed, message, false, error); terminationPromises.push(this._terminate(TestResult.Crashed, message, false, error));
}; };
const handleException = e => { const handleException = e => {
const { message, error } = this._toError('UNHANDLED ERROR', e); const { message, error } = this._toError('UNHANDLED ERROR', e);
this._terminate(TestResult.Crashed, message, false, error); terminationPromises.push(this._terminate(TestResult.Crashed, message, false, error));
}; };
process.on('SIGINT', handleSIGINT); process.on('SIGINT', handleSIGINT);
process.on('SIGHUP', handleSIGHUP); process.on('SIGHUP', handleSIGHUP);
@ -415,7 +416,7 @@ class TestRunner {
let timeoutId; let timeoutId;
if (totalTimeout) { if (totalTimeout) {
timeoutId = setTimeout(() => { timeoutId = setTimeout(() => {
this._terminate(TestResult.Terminated, `Total timeout of ${totalTimeout}ms reached.`, true /* force */, null /* error */); terminationPromises.push(this._terminate(TestResult.Terminated, `Total timeout of ${totalTimeout}ms reached.`, true /* force */, null /* error */));
}, totalTimeout); }, totalTimeout);
} }
await this._runDelegateCallback(this._delegate.onStarted, [testRuns]); await this._runDelegateCallback(this._delegate.onStarted, [testRuns]);
@ -427,6 +428,7 @@ class TestRunner {
workerPromises.push(this._runWorker(initialTestRunIndex, testRuns, i)); workerPromises.push(this._runWorker(initialTestRunIndex, testRuns, i));
} }
await Promise.all(workerPromises); await Promise.all(workerPromises);
await Promise.all(terminationPromises);
if (testRuns.some(run => run.isFailure())) if (testRuns.some(run => run.isFailure()))
this._result.setResult(TestResult.Failed, ''); this._result.setResult(TestResult.Failed, '');