Reenable disabled tests post VSCode refresh (#20899)

* Reenable disabled tests * Extension unit test updates * Turn off data workspace tests on Linux * Keep integration and smoke tests disabled
2026-02-16 18:46:40 -05:00 · 2022-10-21 21:40:52 -07:00
parent 3e1f2b0d9d
commit 5a7ae8a3d0
12 changed files with 342 additions and 95 deletions
--- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
@@ -112,7 +112,7 @@ steps:
    displayName: Run unit tests
    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))

-  # {{SQL CARBON TODO}} - disable while investigating
+  # {{SQL CARBON TODO}} - reenable
  # - script: |
  #     # Figure out the full absolute path of the product we just built
  #     # including the remote server and configure the integration tests
@@ -134,7 +134,7 @@ steps:

  # Per https://developercommunity.visualstudio.com/t/variablesexpressions-dont-work-with-continueonerro/1187733 we can't use variables
  # in continueOnError directly so instead make two copies of the task and only run one or the other based on the SMOKE_FAIL_ON_ERROR value
-  # {{SQL CARBON TODO}} - turn off smoke tests
+  # {{SQL CARBON TODO}} -- reenable
  # - script: |
  #     set -e
  #     APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH)
--- a/build/azure-pipelines/linux/sql-product-build-linux.yml
+++ b/build/azure-pipelines/linux/sql-product-build-linux.yml
@@ -123,7 +123,7 @@ steps:
    displayName: Run unit tests (Electron)
    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'), ne(variables['EXTENSIONS_ONLY'], 'true'))

-  # {{SQL CARBON TODO}} - disable while investigating
+  # {{SQL CARBON TODO}} -- reenable
  # - script: |
  #     # Figure out the full absolute path of the product we just built
  #     # including the remote server and configure the integration tests
@@ -137,35 +137,33 @@ steps:
  #   displayName: Run integration tests (Electron)
  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'), ne(variables['EXTENSIONS_ONLY'], 'true'))

-  # {{SQL CARBON TODO}} - reenable
-  # - script: |
-  #     # Figure out the full absolute path of the product we just built
-  #     # including the remote server and configure the unit tests
-  #     # to run with these builds instead of running out of sources.
-  #     set -e
-  #     APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
-  #     APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-  #     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-  #     NO_CLEANUP=1 \
-  #     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \
-  #     DISPLAY=:10 ./scripts/test-extensions-unit.sh --build --tfs "Extension Unit Tests"
-  #   displayName: 'Run Extension Unit Tests'
-  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+  - script: |
+      # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the unit tests
+      # to run with these builds instead of running out of sources.
+      set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-linux-x64
+      APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+      NO_CLEANUP=1 \
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-linux-x64" \
+      DISPLAY=:10 ./scripts/test-extensions-unit.sh --build --tfs "Extension Unit Tests"
+    displayName: 'Run Extension Unit Tests'
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))

-  # {{SQL CARBON TODO}}
-  # - bash: |
-  #     set -e
-  #     mkdir -p $(Build.ArtifactStagingDirectory)/logs/linux-x64
-  #     cd /tmp
-  #     for folder in adsuser*/
-  #     do
-  #     folder=${folder%/}
-  #     # Only archive directories we want for debugging purposes
-  #     tar -czvf $(Build.ArtifactStagingDirectory)/logs/linux-x64/$folder.tar.gz $folder/User $folder/logs
-  #     done
-  #   displayName: Archive Logs
-  #   continueOnError: true
-  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+  - bash: |
+      set -e
+      mkdir -p $(Build.ArtifactStagingDirectory)/logs/linux-x64
+      cd /tmp
+      for folder in adsuser*/
+      do
+      folder=${folder%/}
+      # Only archive directories we want for debugging purposes
+      tar -czvf $(Build.ArtifactStagingDirectory)/logs/linux-x64/$folder.tar.gz $folder/User $folder/logs
+      done
+    displayName: Archive Logs
+    continueOnError: true
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))

  - script: |
      set -e
@@ -223,14 +221,13 @@ steps:
      ./build/azure-pipelines/linux/createDrop.sh
    displayName: Create Drop

-  # {{SQL CARBON TODO}}
-  # - script: |
-  #     set -e
-  #     shopt -s globstar
-  #     mkdir -p $(Build.ArtifactStagingDirectory)/test-results/coverage
-  #     cp --parents -r $(Build.SourcesDirectory)/extensions/*/coverage/** $(Build.ArtifactStagingDirectory)/test-results/coverage
-  #   displayName: Copy Coverage
-  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+  - script: |
+      set -e
+      shopt -s globstar
+      mkdir -p $(Build.ArtifactStagingDirectory)/test-results/coverage
+      cp --parents -r $(Build.SourcesDirectory)/extensions/*/coverage/** $(Build.ArtifactStagingDirectory)/test-results/coverage
+    displayName: Copy Coverage
+    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))

  - task: PublishTestResults@2
    displayName: 'Publish Test Results test-results.xml'
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -183,28 +183,27 @@ steps:
    timeoutInMinutes: 20
    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))

-  # {{SQL CARBON TODO}} - disable while investigating
-  # - powershell: |
-  #     # Figure out the full absolute path of the product we just built
-  #     # including the remote server and configure the integration tests
-  #     # to run with these builds instead of running out of sources.
-  #     . build/azure-pipelines/win32/exec.ps1
-  #     $ErrorActionPreference = "Stop"
-  #     $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-  #     $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)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
-  #   displayName: Run integration tests (Electron)
-  #   timeoutInMinutes: 20
-  #   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
-  # {{SQL CARBON TODO}} - disable while investigating
-  # - powershell: |
-  #     . build/azure-pipelines/win32/exec.ps1
-  #     $ErrorActionPreference = "Stop"
-  #     exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\scripts\test-web-integration.bat --browser firefox }
-  #   displayName: Run integration tests (Browser, Firefox)
-  #   timeoutInMinutes: 20
-  #   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+  - powershell: |
+      # Figure out the full absolute path of the product we just built
+      # including the remote server and configure the integration tests
+      # to run with these builds instead of running out of sources.
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+      $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)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
+    displayName: Run integration tests (Electron)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\scripts\test-web-integration.bat --browser firefox }
+    displayName: Run integration tests (Browser, Firefox)
+    timeoutInMinutes: 20
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64'))

  - powershell: |
      . build/azure-pipelines/win32/exec.ps1
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -140,7 +140,7 @@ steps:
  #   displayName: Run unit tests (Electron)
  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))

-  # {{SQL CARBON TODO}} - disable while investigating
+  # {{SQL CARBON TODO}} -- reenable
  # - powershell: |
  #     # Figure out the full absolute path of the product we just built
  #     # including the remote server and configure the integration tests