From cc8afa97d03f166876e416b28d0fbd6b583c4299 Mon Sep 17 00:00:00 2001 From: Sakshi Sharma <57200045+SakshiS-harma@users.noreply.github.com> Date: Thu, 27 Oct 2022 11:08:26 -0700 Subject: [PATCH] Update test names from "Electron" to "Core " (#20917) * Update test naming convention from Electron to Core to avoid confusions * Added comments * Fix comment placement * Remove CARBON EDIT from sql-* files --- .github/workflows/ci.yml | 17 ++++++++++------- .../darwin/continuous-build-darwin.yml | 4 ++-- .../darwin/sql-product-build-darwin.yml | 6 +++--- .../linux/continuous-build-linux.yml | 4 ++-- .../linux/sql-product-build-linux.yml | 4 ++-- .../win32/continuous-build-win32.yml | 4 ++-- .../win32/sql-product-build-win32.yml | 4 ++-- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1edd0f374d..19bee2223d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,13 +71,14 @@ jobs: - name: Compile and Download run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" # {{SQL CARBON EDIT}} Remove unused options playwright-install download-builtin-extensions - - name: Run Unit Tests (Electron) + - name: Run Core Unit Tests # {{SQL CARBON EDIT}} Rename to core for clarity run: .\scripts\test.bat # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} disable for now # run: yarn test-browser --browser chromium - # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} disable for now + # {{SQL CARBON EDIT}} Rename to core for clarity + # - name: Run Core Integration Tests {{SQL CARBON EDIT}} disable for now # run: .\scripts\test-integration.bat linux: @@ -137,11 +138,11 @@ jobs: env: SQL_NO_INLINE_SOURCEMAP: 1 - - name: Run Unit Tests (Electron) + - name: Run Core Unit Tests # {{SQL CARBON EDIT}} Rename to core for clarity id: electron-unit-tests run: DISPLAY=:10 ./scripts/test.sh --runGlob "**/sql/**/*.test.js" --coverage - - name: Run Extension Unit Tests (Electron) + - name: Run Extension Unit Tests # {{SQL CARBON EDIT}} Rename to core for clarity id: electron-extension-unit-tests run: DISPLAY=:10 ./scripts/test-extensions-unit.sh @@ -158,7 +159,8 @@ jobs: # id: browser-unit-tests # run: DISPLAY=:10 yarn test-browser --browser chromium - # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} Skip for now + # {{SQL CARBON EDIT}} Rename to core for clarity + # - name: Run Core Integration Tests {{SQL CARBON EDIT}} Skip for now # id: electron-integration-tests # run: DISPLAY=:10 ./scripts/test-integration.sh @@ -215,13 +217,14 @@ jobs: security default-keychain -s $RUNNER_TEMP/buildagent.keychain security unlock-keychain -p pwd $RUNNER_TEMP/buildagent.keychain - - name: Run Unit Tests (Electron) + - name: Run Core Unit Tests # {{SQL CARBON EDIT}} Rename to core for clarity run: DISPLAY=:10 ./scripts/test.sh # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} Skip for now # run: DISPLAY=:10 yarn test-browser --browser chromium - # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} Skip for now + # {{SQL CARBON EDIT}} Rename to core for clarity + # - name: Run Core Integration Tests {{SQL CARBON EDIT}} Skip for now # run: DISPLAY=:10 ./scripts/test-integration.sh hygiene: diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml index d23a9b41a8..d9fa1d260f 100644 --- a/build/azure-pipelines/darwin/continuous-build-darwin.yml +++ b/build/azure-pipelines/darwin/continuous-build-darwin.yml @@ -49,7 +49,7 @@ steps: - script: | ./scripts/test.sh --tfs "Unit Tests" - displayName: Run Unit Tests (Electron) + displayName: Run Core Unit Tests # {{SQL CARBON EDIT}} Rename to core for clarity # - script: | {{SQL CARBON EDIT}} disable # yarn test-browser --browser chromium --browser webkit --browser firefox --tfs "Browser Unit Tests" @@ -57,7 +57,7 @@ steps: # - script: | {{SQL CARBON EDIT}} disable # ./scripts/test-integration.sh --tfs "Integration Tests" - # displayName: Run Integration Tests (Electron) + # displayName: Run Core Integration Tests # {{SQL CARBON EDIT}} Rename to core for clarity - task: PublishPipelineArtifact@0 inputs: diff --git a/build/azure-pipelines/darwin/sql-product-build-darwin.yml b/build/azure-pipelines/darwin/sql-product-build-darwin.yml index 4bd1d990cf..fb5082ecaf 100644 --- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml +++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml @@ -122,7 +122,7 @@ steps: INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-darwin" \ ./scripts/test-integration.sh --build --tfs "Integration Tests" - displayName: Run integration tests (Electron) + displayName: Run core integration tests condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true')) - script: | @@ -139,7 +139,7 @@ steps: # APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH) # APP_NAME="`ls $APP_ROOT | head -n 1`" # yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions" --extraArgs "--disable-extension Microsoft.kusto --disable-extension Microsoft.azuremonitor" - # displayName: Run smoke tests (Electron) (Continue on Error) + # displayName: Run core smoke tests (Continue on Error) # continueOnError: true # condition: and(succeeded(), and(or(eq(variables['RUN_TESTS'], 'true'), eq(variables['RUN_SMOKE_TESTS'], 'true')), ne(variables['SMOKE_FAIL_ON_ERROR'], 'true'))) @@ -148,7 +148,7 @@ steps: # APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH) # APP_NAME="`ls $APP_ROOT | head -n 1`" # yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions" - # displayName: Run smoke tests (Electron) (Fail on Error) + # displayName: Run core smoke tests (Fail on Error) # condition: and(succeeded(), and(or(eq(variables['RUN_TESTS'], 'true'), eq(variables['RUN_SMOKE_TESTS'], 'true')), eq(variables['SMOKE_FAIL_ON_ERROR'], 'true'))) # - script: | diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml index cb40a97a3a..15500aa4ab 100644 --- a/build/azure-pipelines/linux/continuous-build-linux.yml +++ b/build/azure-pipelines/linux/continuous-build-linux.yml @@ -67,7 +67,7 @@ steps: - script: | DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" - displayName: Run Unit Tests (Electron) + displayName: Run Core Unit Tests # {{SQL CARBON EDIT}} Rename to core for clarity # - script: | {{SQL CARBON EDIT}} disable # DISPLAY=:10 yarn test-browser --browser chromium --tfs "Browser Unit Tests" @@ -75,7 +75,7 @@ steps: # - script: | {{SQL CARBON EDIT}} disable # DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" - # displayName: Run Integration Tests (Electron) + # displayName: Run Core Integration Tests # {{SQL CARBON EDIT}} Rename to core for clarity # - task: PublishPipelineArtifact@0 # inputs: diff --git a/build/azure-pipelines/linux/sql-product-build-linux.yml b/build/azure-pipelines/linux/sql-product-build-linux.yml index 40b97ae0d4..877305b94c 100644 --- a/build/azure-pipelines/linux/sql-product-build-linux.yml +++ b/build/azure-pipelines/linux/sql-product-build-linux.yml @@ -120,7 +120,7 @@ steps: - script: | set -e DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests" --coverage - displayName: Run unit tests (Electron) + displayName: Run core unit tests condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'), ne(variables['EXTENSIONS_ONLY'], 'true')) - script: | @@ -133,7 +133,7 @@ steps: INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \ DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests" - displayName: Run integration tests (Electron) + displayName: Run core integration tests condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'), ne(variables['EXTENSIONS_ONLY'], 'true')) - script: | diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml index 3d63a5118a..2905219152 100644 --- a/build/azure-pipelines/win32/continuous-build-win32.yml +++ b/build/azure-pipelines/win32/continuous-build-win32.yml @@ -56,7 +56,7 @@ steps: - powershell: | .\scripts\test.bat --tfs "Unit Tests" - displayName: Run Unit Tests (Electron) + displayName: Run Core Unit Tests # {{SQL CARBON EDIT}} Rename to core for clarity # - powershell: | {{SQL CARBON EDIT}} disable # yarn test-browser --browser chromium --browser firefox --tfs "Browser Unit Tests" @@ -64,7 +64,7 @@ steps: # - powershell: | {{SQL CARBON EDIT}} disable # .\scripts\test-integration.bat --tfs "Integration Tests" - # displayName: Run Integration Tests (Electron) + # displayName: Run Core Integration Tests # {{SQL CARBON EDIT}} Rename to core for clarity - task: PublishPipelineArtifact@0 displayName: "Publish Crash Reports" diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml index b50b9d5a45..fb0b03527e 100644 --- a/build/azure-pipelines/win32/sql-product-build-win32.yml +++ b/build/azure-pipelines/win32/sql-product-build-win32.yml @@ -137,7 +137,7 @@ steps: # $ErrorActionPreference = "Stop" # exec { yarn electron x64 } # exec { .\scripts\test.bat --build --coverage --reporter mocha-junit-reporter --tfs "Unit Tests" } - # displayName: Run unit tests (Electron) + # displayName: Run core unit tests # condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true')) # {{SQL CARBON TODO}} -- reenable @@ -151,7 +151,7 @@ steps: # $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json # $AppNameShort = $AppProductJson.nameShort # # exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\azuredatastudio-reh-win32-x64"; .\scripts\test-integration.bat --build --tfs "Integration Tests" } - # displayName: Run integration tests (Electron) + # displayName: Run core integration tests # condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true')) - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1