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

Deactivate extensions after tests are run (#96090 , #146944)

Browse Source
This commit is contained in:
Alex Dima
2022-04-07 22:27:14 +02:00
parent e02a7747eb
commit 80e81c66c0
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vs/workbench/api/common/extHostExtensionService.ts
View File

@@ -223,13 +223,13 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
await Promise.all(allPromises);
}
public terminate(reason: string): void {
public terminate(reason: string, code: number = 0): void {
if (this._isTerminating) {
// we are already shutting down...
return;
}
this._isTerminating = true;
this._logService.info(`extension host terminating: ${reason}`);
this._logService.info(`Extension host terminating: ${reason}`);
this._logService.flush();
this._extHostTerminalService.dispose();
@@ -247,13 +247,13 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
// Give extensions at most 5 seconds to wrap up any async deactivate, then exit
Promise.race([timeout(5000), extensionsDeactivated]).finally(() => {
if (this._hostUtils.pid) {
this._logService.info(`Extension host with pid ${this._hostUtils.pid} exiting with code 0`);
this._logService.info(`Extension host with pid ${this._hostUtils.pid} exiting with code ${code}`);
} else {
this._logService.info(`Extension host exiting with code 0`);
this._logService.info(`Extension host exiting with code ${code}`);
}
this._logService.flush();
this._logService.dispose();
this._hostUtils.exit(0);
this._hostUtils.exit(code);
});
}
@@ -689,12 +689,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
}
public async $extensionTestsExit(code: number): Promise<void> {
this._logService.info(`Extension host terminating: test runner requested exit with code ${code}`);
if (this._hostUtils.pid) {
this._logService.info(`Extension host with pid ${this._hostUtils.pid} exiting with code ${code}`);
}
this._logService.flush();
this._hostUtils.exit(code);
this.terminate(`test runner requested exit with code ${code}`, code);
}
private _startExtensionHost(): Promise<void> {