Skip to content

Fix CLI child process cleanup on app quit #2997

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

Merged
wojtekn merged 3 commits into from
Apr 7, 2026
Merged

Fix CLI child process cleanup on app quit #2997

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
377f162
Retry rimraf on ENOTEMPTY during E2E session cleanup
wojtekn Apr 7, 2026
782188e
Wait for CLI child processes to exit before quitting the app
wojtekn Apr 7, 2026
fe466c4
Revert "Wait for CLI child processes to exit before quitting the app"
wojtekn Apr 7, 2026
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion apps/studio/e2e/e2e-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { randomUUID } from 'crypto';
import { tmpdir } from 'os';
import path from 'path';
import { isErrnoException } from '@studio/common/lib/is-errno-exception';
import { findLatestBuild, parseElectronApp } from 'electron-playwright-helpers';
import fs from 'fs-extra';
import { _electron as electron, Page, ElectronApplication } from 'playwright';
Expand Down Expand Up @@ -93,7 +94,19 @@ export class E2ESession {

async cleanup() {
await this.closeApp();
await rimraf( this.sessionPath );
// Retry on ENOTEMPTY: CLI child processes (e.g. copying skills to server-files) may still be
// writing to the session directory briefly after the Electron process exits.
for ( let attempt = 0; attempt < 5; attempt++ ) {
try {
await rimraf( this.sessionPath );
return;
} catch ( error ) {
if ( ! isErrnoException( error ) || error.code !== 'ENOTEMPTY' || attempt === 4 ) {
throw error;
}
await new Promise< void >( ( resolve ) => setTimeout( resolve, 500 ) );
}
}
}

private async launchFirstWindow( testEnv: NodeJS.ProcessEnv = {} ) {
Expand Down
Loading