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

fix(cleanup): use rimraf.sync on process exit (#9862)

Browse source 
Currently we call async `removeFolders` from a synchronous
`process.on('exit')` handler, which should not work.
This commit is contained in:
Dmitry Gozman 2021-10-28 19:28:16 -07:00 committed by GitHub
parent 1886897e5c
commit e8c512dbeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packages/playwright-core/src/utils/processLauncher.ts
View file

@ -19,6 +19,7 @@ import * as childProcess from 'child_process';
import * as readline from 'readline'; import * as readline from 'readline';
import { eventsHelper } from './eventsHelper'; import { eventsHelper } from './eventsHelper';
import { isUnderTest, removeFolders } from './utils'; import { isUnderTest, removeFolders } from './utils';
import rimraf from 'rimraf';
export type Env = {[key: string]: string | number | boolean | undefined}; export type Env = {[key: string]: string | number | boolean | undefined};
@ -124,7 +125,7 @@ export async function launchProcess(options: LaunchProcessOptions): Promise<Laun
cleanup().then(fulfillCleanup); cleanup().then(fulfillCleanup);
}); });
const listeners = [ eventsHelper.addEventListener(process, 'exit', killProcess) ]; const listeners = [ eventsHelper.addEventListener(process, 'exit', killProcessAndCleanup) ];
if (options.handleSIGINT) { if (options.handleSIGINT) {
listeners.push(eventsHelper.addEventListener(process, 'SIGINT', () => { listeners.push(eventsHelper.addEventListener(process, 'SIGINT', () => {
gracefullyClose().then(() => { gracefullyClose().then(() => {
@ -183,7 +184,19 @@ export async function launchProcess(options: LaunchProcessOptions): Promise<Laun
} else { } else {
options.log(`[pid=${spawnedProcess.pid}] <skipped force kill spawnedProcess.killed=${spawnedProcess.killed} processClosed=${processClosed}>`); options.log(`[pid=${spawnedProcess.pid}] <skipped force kill spawnedProcess.killed=${spawnedProcess.killed} processClosed=${processClosed}>`);
} }
cleanup(); }
function killProcessAndCleanup() {
killProcess();
options.log(`[pid=${spawnedProcess.pid || 'N/A'}] starting temporary directories cleanup`);
for (const dir of options.tempDirectories) {
try {
rimraf.sync(dir, { maxBusyTries: 10 });
} catch (e) {
options.log(`[pid=${spawnedProcess.pid || 'N/A'}] exception while removing ${dir}: ${e}`);
}
}
options.log(`[pid=${spawnedProcess.pid || 'N/A'}] finished temporary directories cleanup`);
} }
function killAndWait() { function killAndWait() {