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 - align killing

Browse Source
This commit is contained in:
Benjamin Pasero 2021-12-09 08:03:48 +01:00
parent ec3ba7a320
commit 15415b6de6
No known key found for this signature in database
GPG Key ID: E6380CC4C8219E65
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/platform/windows/electron-main/window.ts
View File

@ -595,6 +595,12 @@ export class CodeWindow extends Disposable implements ICodeWindow {
return;
}
// If we run smoke tests, we never want to show a blocking dialog
if (this.environmentMainService.driverHandle) {
this.destroyWindow(false);
return;
}
// Unresponsive
if (type === WindowError.UNRESPONSIVE) {
if (this.isExtensionDevelopmentHost || this.isExtensionTestHost || (this._win && this._win.webContents && this._win.webContents.isDevToolsOpened())) {

46
test/automation/src/electronDriver.ts
View File

@ -13,7 +13,7 @@ import { promisify } from 'util';
import * as kill from 'tree-kill';
import { copyExtension } from './extensions';
import { URI } from 'vscode-uri';
import { measureAndLog } from './logger';
import { Logger, measureAndLog } from './logger';
import type { LaunchOptions } from './code';
const repoPath = path.join(__dirname, '../../..');
@ -100,18 +100,7 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess:
electronProcess,
client,
driver,
kill: async () => {
try {
return promisify(kill)(electronProcess.pid!);
} catch (error) {
try {
process.kill(electronProcess.pid!, 0); // throws an exception if the process doesn't exist anymore
logger.log(`Error tearing down electron client (pid: ${electronProcess.pid}): ${error}`);
} catch (error) {
return; // Expected when process is gone
}
}
}
kill: () => teardown(electronProcess, options.logger)
};
} catch (err) {
@ -119,11 +108,7 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess:
if (++retries > 30) {
logger.log(`Error connecting driver: ${err}. Giving up...`);
try {
await measureAndLog(promisify(kill)(electronProcess.pid!), 'Kill Electron after failing to connect', logger);
} catch (error) {
logger.log(`Error tearing down electron client (pid: ${electronProcess.pid}): ${error}`);
}
await measureAndLog(teardown(electronProcess, logger), 'Kill Electron after failing to connect', logger);
throw err;
}
@ -140,6 +125,31 @@ export async function launch(options: LaunchOptions): Promise<{ electronProcess:
}
}
async function teardown(electronProcess: ChildProcess, logger: Logger): Promise<void> {
const electronPid = electronProcess.pid;
if (typeof electronPid !== 'number') {
return;
}
let retries = 0;
while (retries < 3) {
retries++;
try {
return await promisify(kill)(electronPid);
} catch (error) {
try {
process.kill(electronPid, 0); // throws an exception if the process doesn't exist anymore
logger.log(`Error tearing down electron client (pid: ${electronPid}, attempt: ${retries}): ${error}`);
} catch (error) {
return; // Expected when process is gone
}
}
}
logger.log(`Gave up tearing down electron client after ${retries} attempts...`);
}
function getDevElectronPath(): string {
const buildPath = path.join(repoPath, '.build');
const product = require(path.join(repoPath, 'product.json'));