Smoke test driver.exitApplication sometimes does not work (microsoft#157979) (microsoft#158479)

bpasero · web-flow · commit e868117fa943 · 2022-08-18T09:03:44.000-04:00
diff --git a/automation/src/code.ts b/automation/src/code.ts
@@ -140,7 +140,7 @@ export class Code {
 	}
 
 	async exit(): Promise<void> {
-		return measureAndLog(new Promise<void>((resolve, reject) => {
+		return measureAndLog(new Promise<void>(resolve => {
 			const pid = this.mainProcess.pid!;
 
 			let done = false;
@@ -154,8 +154,8 @@ export class Code {
 				while (!done) {
 					retries++;
 
-					if (retries === 20) {
-						this.logger.log('Smoke test exit call did not terminate process after 10s, forcefully exiting the application...');
+					if (retries === 40) {
+						this.logger.log('Smoke test exit call did not terminate process after 20s, forcefully exiting the application...');
 
 						// no need to await since we're polling for the process to die anyways
 						treekill(pid, err => {
diff --git a/smoke/src/areas/workbench/data-loss.test.ts b/smoke/src/areas/workbench/data-loss.test.ts
@@ -9,18 +9,6 @@ import { createApp, timeout, installDiagnosticsHandler, installAppAfterHandler,
 
 export function setup(ensureStableCode: () => string | undefined, logger: Logger) {
 	describe('Data Loss (insiders -> insiders)', function () {
-
-		// There are cases where `exitApplication` does not actually
-		// stop the application and our attempt then to `kill` the
-		// process tree results in data loss / state loss. All these
-		// tests here rely on state getting persisted properly, so
-		// until we have figured out the root cause, we retry these
-		// tests.
-		// See: https://github.com/microsoft/vscode/issues/157979
-		if (process.platform === 'darwin') {
-			this.retries(2);
-		}
-
 		let app: Application | undefined = undefined;
 
 		// Shared before/after handling
@@ -142,18 +130,6 @@ export function setup(ensureStableCode: () => string | undefined, logger: Logger
 	});
 
 	describe('Data Loss (stable -> insiders)', function () {
-
-		// There are cases where `exitApplication` does not actually
-		// stop the application and our attempt then to `kill` the
-		// process tree results in data loss / state loss. All these
-		// tests here rely on state getting persisted properly, so
-		// until we have figured out the root cause, we retry these
-		// tests.
-		// See: https://github.com/microsoft/vscode/issues/157979
-		if (process.platform === 'darwin') {
-			this.retries(2);
-		}
-
 		let insidersApp: Application | undefined = undefined;
 		let stableApp: Application | undefined = undefined;
 
