From 8d482a06e8881e56aa373ab922adf941e260bd84 Mon Sep 17 00:00:00 2001
From: Alan Ren <alanren@microsoft.com>
Date: Thu, 29 Apr 2021 11:36:42 -0700
Subject: [PATCH] fix smoke test failure (#15276)

* add logging

* fix

* remove logging

* comment out code and add comments
---
 test/smoke/src/main.ts | 48 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index cf31c5fdb4..fe172cb08d 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -311,29 +311,31 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	// 	});
 	// }
 
-	describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
-		before(async function () {
-			const app = new Application(this.defaultOptions);
-			await app!.start(opts.web ? false : undefined);
-			this.app = app;
-		});
+	// {{SQL CARBON EDIT}} - Remove the nested test suite to make sure the suite setup is also applied to beforeEach and afterEach
+	// describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 
-		after(async function () {
-			await this.app.stop();
-		});
-
-		sqlMain(opts.web);
-
-		/* if (!opts.web) { setupDataLossTests(); }
-		if (!opts.web) { setupDataPreferencesTests(); }
-		setupDataSearchTests();
-		setupDataNotebookTests();
-		setupDataLanguagesTests();
-		setupDataEditorTests();
-		setupDataStatusbarTests(!!opts.web);
-		setupDataExtensionTests();
-		if (!opts.web) { setupDataMultirootTests(); }
-		if (!opts.web) { setupDataLocalizationTests(); }
-		if (!opts.web) { setupLaunchTests(); }*/
+	before(async function () {
+		const app = new Application(this.defaultOptions);
+		await app!.start(opts.web ? false : undefined);
+		this.app = app;
 	});
+
+	after(async function () {
+		await this.app.stop();
+	});
+
+	sqlMain(opts.web);
+
+	/* if (!opts.web) { setupDataLossTests(); }
+	if (!opts.web) { setupDataPreferencesTests(); }
+	setupDataSearchTests();
+	setupDataNotebookTests();
+	setupDataLanguagesTests();
+	setupDataEditorTests();
+	setupDataStatusbarTests(!!opts.web);
+	setupDataExtensionTests();
+	if (!opts.web) { setupDataMultirootTests(); }
+	if (!opts.web) { setupDataLocalizationTests(); }
+	if (!opts.web) { setupLaunchTests(); }*/
+	// });
 });