From fcec5f2b59267372da5a30de0564354ecfc9de7e Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Tue, 11 Feb 2020 08:32:36 +0000 Subject: [PATCH] disable browser tests for now --- build/azure-pipelines/darwin/continuous-build-darwin.yml | 6 +++--- build/azure-pipelines/linux/continuous-build-linux.yml | 6 +++--- build/azure-pipelines/win32/continuous-build-win32.yml | 6 +++--- test/unit/browser/renderer.html | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml index 0849c5a685..9ee7e7813f 100644 --- a/build/azure-pipelines/darwin/continuous-build-darwin.yml +++ b/build/azure-pipelines/darwin/continuous-build-darwin.yml @@ -44,9 +44,9 @@ steps: - script: | ./scripts/test.sh --tfs "Unit Tests" displayName: Run Unit Tests (Electron) -- script: | - yarn test-browser --browser chromium --browser webkit - displayName: Run Unit Tests (Browser) +# - script: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser +# yarn test-browser --browser chromium --browser webkit +# displayName: Run Unit Tests (Browser) # - script: | {{SQL CARBON EDIT}} remove step # ./scripts/test-integration.sh --tfs "Integration Tests" # displayName: Run Integration Tests (Electron) diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml index 2d0209cf0b..2494196aae 100644 --- a/build/azure-pipelines/linux/continuous-build-linux.yml +++ b/build/azure-pipelines/linux/continuous-build-linux.yml @@ -52,9 +52,9 @@ steps: - script: | DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" displayName: Run Unit Tests (Electron) -- script: | - DISPLAY=:10 yarn test-browser --browser chromium - displayName: Run Unit Tests (Browser) +# - script: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser +# DISPLAY=:10 yarn test-browser --browser chromium +# displayName: Run Unit Tests (Browser) # - script: | {{SQL CARBON EDIT}} remove step # DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" # displayName: Run Integration Tests (Electron) diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml index cde9952139..680fb08ad3 100644 --- a/build/azure-pipelines/win32/continuous-build-win32.yml +++ b/build/azure-pipelines/win32/continuous-build-win32.yml @@ -49,9 +49,9 @@ steps: - powershell: | .\scripts\test.bat --tfs "Unit Tests" displayName: Run Unit Tests (Electron) -- powershell: | - yarn test-browser --browser chromium - displayName: Run Unit Tests (Browser) +# - powershell: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser +# yarn test-browser --browser chromium +# displayName: Run Unit Tests (Browser) # - powershell: | {{SQL CARBON EDIT}} remove step # .\scripts\test-integration.bat --tfs "Integration Tests" # displayName: Run Integration Tests (Electron) diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html index 61b2de146a..0a8a7b8d51 100644 --- a/test/unit/browser/renderer.html +++ b/test/unit/browser/renderer.html @@ -54,7 +54,8 @@ 'vs': new URL(`../../../${!!isBuild ? 'out-build' : 'out'}/vs`, baseUrl).href, assert: new URL('../assert.js', baseUrl).href, sinon: new URL('../../../node_modules/sinon/pkg/sinon-1.17.7.js', baseUrl).href, - xterm: new URL('../../../node_modules/xterm/lib/xterm.js', baseUrl).href + xterm: new URL('../../../node_modules/xterm/lib/xterm.js', baseUrl).href, + 'sql': new URL(`../../../${!!isBuild ? 'out-build' : 'out'}/sql`, baseUrl).href, } });