development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

proper await exit

Browse source
This commit is contained in:
Benjamin Pasero 2021-11-23 10:31:46 +01:00
parent 187ccb8ec4
commit 954ce2c3f4
No known key found for this signature in database
GPG key ID: E6380CC4C8219E65
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
test/automation/src/code.ts
View file

@ -69,7 +69,7 @@ async function connect(connectDriver: typeof connectElectronDriver, child: cp.Ch
while (true) {
try {
const { client, driver } = await connectDriver(outPath, handlePath);
return new Code(client, driver, logger);
return new Code(client, driver, logger, child?.pid);
} catch (err) {
if (++errCount > 50) {
if (child) {
@ -254,7 +254,8 @@ export class Code {
constructor(
private client: IDisposable,
driver: IDriver,
readonly logger: Logger
readonly logger: Logger,
private readonly pid: number | undefined
) {
this.driver = new Proxy(driver, {
get(target, prop, receiver) {
@ -295,9 +296,27 @@ export class Code {
}
async exit(): Promise<void> {
const veto = await this.driver.exitApplication();
if (veto === true) {
throw new Error('Code exit was blocked by a veto.');
const exitPromise = this.driver.exitApplication();
// If we know the `pid`, use that to await the
// process to terminate (desktop).
const pid = this.pid;
if (typeof pid === 'number') {
await (async () => {
while (true) {
try {
process.kill(pid, 0); // throws an exception if the main process doesn't exist anymore.
await new Promise(c => setTimeout(c, 100));
} catch (error) {
return;
}
}
})();
}
// Otherwise await the exit promise (web).
else {
await exitPromise;
}
}