diff --git a/src/vs/platform/extensions/electron-main/directMainProcessExtensionHostStarter.ts b/src/vs/platform/extensions/electron-main/directMainProcessExtensionHostStarter.ts index a238332b86d..8c9bfd32a48 100644 --- a/src/vs/platform/extensions/electron-main/directMainProcessExtensionHostStarter.ts +++ b/src/vs/platform/extensions/electron-main/directMainProcessExtensionHostStarter.ts @@ -15,10 +15,15 @@ export class DirectMainProcessExtensionHostStarter extends ExtensionHostStarter ) { super(logService); - // Abnormal shutdown: terminate extension hosts asap - lifecycleMainService.onWillKill(() => { - this.killAllNow(); - }); + // TODO: in the remote integration tests, this leads to the extension + // host processes getting killed brutally, which leads to the + // test resolver not having a chance to deactivate and kill the server processes + // it launches + + // // Abnormal shutdown: terminate extension hosts asap + // lifecycleMainService.onWillKill(() => { + // this.killAllNow(); + // }); // Normal shutdown: gracefully await extension host shutdowns lifecycleMainService.onWillShutdown((e) => { diff --git a/src/vs/platform/extensions/electron-main/workerMainProcessExtensionHostStarter.ts b/src/vs/platform/extensions/electron-main/workerMainProcessExtensionHostStarter.ts index 2abb2eb9dfd..f98915bfdb6 100644 --- a/src/vs/platform/extensions/electron-main/workerMainProcessExtensionHostStarter.ts +++ b/src/vs/platform/extensions/electron-main/workerMainProcessExtensionHostStarter.ts @@ -80,13 +80,18 @@ export class WorkerMainProcessExtensionHostStarter implements IDisposable, IExte ); this._initialize(); - // Abnormal shutdown: terminate extension hosts asap - lifecycleMainService.onWillKill(async () => { - this._shutdown = true; - if (this._proxy) { - this._proxy.killAllNow(); - } - }); + // TODO: in the remote integration tests, this leads to the extension + // host processes getting killed brutally, which leads to the + // test resolver not having a chance to deactivate and kill the server processes + // it launches + + // // Abnormal shutdown: terminate extension hosts asap + // lifecycleMainService.onWillKill(async () => { + // this._shutdown = true; + // if (this._proxy) { + // this._proxy.killAllNow(); + // } + // }); // Normal shutdown: gracefully await extension host shutdowns lifecycleMainService.onWillShutdown((e) => {