From 1fabd233e9b3a53bf0efbd11e0a670f5fe87ccb6 Mon Sep 17 00:00:00 2001
From: Lewis Sanchez <87730006+lewis-sanchez@users.noreply.github.com>
Date: Mon, 18 Oct 2021 19:46:45 -0700
Subject: [PATCH] Add logging to ADS Web smoke tests, and skip failing tests.
 (#17353)

* Adds loggings to ADS pipeline

* Skips notebook smoke tests for ADS web.

* Skips failing create book dialog tests in web build

* Ignores import tests ADS web

* Groups related tests together for ADS Web and non-web

* Updates distro commit hash
---
 build/azure-pipelines/web/sql-product-build-web.yml |  2 +-
 package.json                                        |  2 +-
 test/smoke/src/sql/main.ts                          | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build/azure-pipelines/web/sql-product-build-web.yml b/build/azure-pipelines/web/sql-product-build-web.yml
index 901bbb4d1d..1ab1a2dd13 100644
--- a/build/azure-pipelines/web/sql-product-build-web.yml
+++ b/build/azure-pipelines/web/sql-product-build-web.yml
@@ -108,7 +108,7 @@ steps:
     set -e
     node ./node_modules/playwright/install.js
     APP_ROOT=$(Agent.BuildDirectory)/vscode-reh-web-linux-x64
-    xvfb-run yarn smoketest --build "$(Agent.BuildDirectory)/vscode-reh-web-linux-x64" --web --headless --screenshots "$(Build.ArtifactStagingDirectory)/smokeshots"
+    xvfb-run yarn smoketest --build "$(Agent.BuildDirectory)/vscode-reh-web-linux-x64" --web --headless --screenshots "$(Build.ArtifactStagingDirectory)/smokeshots" --log "$(Build.ArtifactStagingDirectory)/logs/web/smoke.log"
   displayName: Run smoke tests (Browser)
   continueOnError: true
   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
diff --git a/package.json b/package.json
index 342494123b..c2babe1337 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio",
   "version": "1.33.0",
-  "distro": "01b299c0f340f6cf9dc10290b3aadea449c7940f",
+  "distro": "77e165275b4fa492f172e2b2ff3b9193726bcb49",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/test/smoke/src/sql/main.ts b/test/smoke/src/sql/main.ts
index fa2f2b3d36..d11d5c60e8 100644
--- a/test/smoke/src/sql/main.ts
+++ b/test/smoke/src/sql/main.ts
@@ -19,14 +19,16 @@ import * as mkdirp from 'mkdirp';
 export function main(isWeb: boolean = false): void {
 	if (isWeb) {
 		setupQueryEditorWebTests();
+		setupNotebookViewTests();
+		setupAddRemoteBookDialogTests();
 	} else {
 		setupQueryEditorTests();
+		setupNotebookTests();
+		setupNotebookViewTests();
+		setupCreateBookDialogTests();
+		setupAddRemoteBookDialogTests();
+		setupImportTests();
 	}
-	setupNotebookTests();
-	setupNotebookViewTests();
-	setupCreateBookDialogTests();
-	setupAddRemoteBookDialogTests();
-	setupImportTests();
 }
 
 /* eslint-disable no-sync */