Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 23:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve process termination handling in launch and Code class (#245380)

Browse Source
This commit is contained in:
Benjamin Pasero
2025-04-02 21:24:07 +02:00
committed by GitHub
parent 5f4b2c11cc
commit cf1cfc5f0d
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/automation/src/code.ts
View File

@@ -90,7 +90,7 @@ export async function launch(options: LaunchOptions): Promise<Code> {
const safeToKill = new Promise<void>(resolve => {
process.stdout?.on('data', data => {
if (data.toString().includes('Lifecycle#app.on(will-quit) - calling app.quit()')) {
resolve();
setTimeout(() => resolve(), 500 /* give Electron some time to actually terminate fully */);
}
});
});
@@ -165,22 +165,23 @@ export class Code {
if (safeToKill) {
this.logger.log('Smoke test exit() call did not terminate the process yet, but safeToKill is true, so we can kill it');
process.kill(pid, 'SIGTERM');
process.kill(pid);
}
switch (retries) {
// after 20 seconds: forcefully kill
case 40: {
this.logger.log('Smoke test exit() call did not terminate process after 20s, forcefully exiting the application...');
process.kill(pid, 'SIGTERM');
// after 10 seconds: forcefully kill
case 20: {
this.logger.log('Smoke test exit() call did not terminate process after 10s, forcefully exiting the application...');
process.kill(pid);
break;
}
// after 30 seconds: give up
case 60: {
// after 20 seconds: give up
case 40: {
this.logger.log('Smoke test exit() call did not terminate process after 20s, giving up');
process.kill(pid);
done = true;
this.logger.log('Smoke test exit() call did not terminate process after 30s, giving up');
resolve();
}
}