smoke test tweaks

test/automation/src/playwrightDriver.ts

@@ -279,18 +279,24 @@ async function launchBrowser(options: PlaywrightOptions, endpoint: string, works
 }
 
 async function teardown(server: ChildProcess): Promise<void> {
+	const serverPid = server.pid;
+	if (typeof serverPid !== 'number') {
+		return;
+	}
+
 	let retries = 0;
 	while (retries < 3) {
 		retries++;
 
 		try {
-			if (typeof server.pid === 'number') {
-				await promisify(kill)(server.pid);
-			}
-
-			return;
+			return await promisify(kill)(serverPid);
 		} catch (error) {
-			console.warn(`Error tearing down server (pid: ${server.pid}, attempt: ${retries}): ${error}`);
+			try {
+				process.kill(serverPid, 0); // throws an exception if the process doesn't exist anymore
+				console.warn(`Error tearing down server (pid: ${serverPid}, attempt: ${retries}): ${error}`);
+			} catch (error) {
+				return; // Expected when process is gone
+			}
 		}
 	}
 

test/smoke/src/areas/workbench/data-migration.test.ts

@@ -164,6 +164,9 @@ export function setup(opts: ParsedArgs) {
 			const backupsHome = join(userDataDir, 'Backups');
 			console.log('Printing backup contents (after stable app stopped):');
 			for await (const entry of readdirp(backupsHome)) {
+				if (entry.path === 'workspaces.json') {
+					continue;
+				}
 				try {
 					const contents = readFileSync(join(backupsHome, entry.path)).toString();
 					const firstLine = contents.substring(0, contents.indexOf('\n'));
@@ -186,6 +189,9 @@ export function setup(opts: ParsedArgs) {
 
 			console.log('Printing backup contents (after insiders app started):');
 			for await (const entry of readdirp(backupsHome)) {
+				if (entry.path === 'workspaces.json') {
+					continue;
+				}
 				try {
 					const contents = readFileSync(join(backupsHome, entry.path)).toString();
 					const firstLine = contents.substring(0, contents.indexOf('\n'));