development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-05 01:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Smoke Test: forcefully kill electron if exit doesn't work (#140570)

Browse Source 
* smoke test: forcefully kill electron if exit doesn't work

* use tree-kill

* roll back veto
This commit is contained in:
João Moreno 2022-01-12 17:02:52 +01:00 committed by GitHub
parent 1270176a59
commit 8c9870d298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import { launch as launchElectron } from './electronDriver';
import { launch as launchPlaywright } from './playwrightDriver';
import { Logger, measureAndLog } from './logger';
import { copyExtension } from './extensions';
import * as treekill from 'tree-kill';
const repoPath = path.join(__dirname, '../../..');
@ -201,17 +202,22 @@ export class Code {
while (!done) {
retries++;
if (retries > 20) {
this.logger.log('Smoke test exit call did not terminate process after 10s, still trying...');
if (retries === 20) {
this.logger.log('Smoke test exit call did not terminate process after 10s, forcefully exiting the application...');
// no need to await since we're polling for the process to die anyways
treekill(this.mainProcess.pid, err => {
this.logger.log('Failed to kill Electron process tree:', err?.message);
});
}
if (retries > 40) {
if (retries === 40) {
done = true;
reject(new Error('Smoke test exit call did not terminate process after 20s, giving up'));
}
try {
process.kill(this.mainProcess.pid!, 0); // throws an exception if the process doesn't exist anymore.
process.kill(this.mainProcess.pid, 0); // throws an exception if the process doesn't exist anymore.
await new Promise(resolve => setTimeout(resolve, 500));
} catch (error) {
done = true;