released workflow and test file changes (#1432)

* released workflow and test file changes * changing the test references * added org variable * ignored integrationtest cases as temporary fix * added recordings
Azure · Jan 9, 2025 · 555e533 · 555e533
1 parent b2537e7
commit 555e533
Show file tree

Hide file tree

Showing 111 changed files with 111 additions and 79 deletions.
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
@@ -27,10 +27,10 @@ runs:
     - uses: ./.github/actions/download-install-local-azure-test-sdk
     - uses: ./.github/actions/setup-ci-machine
     - uses: ./.github/actions/download-install-local-azure-devops-cli-extension
-    - run: pytest --junitxml "TEST-results.xml"
+    - run: pytest --junitxml "TEST-results.xml" --ignore=azext_devops/tests/latest/integrationtests
       if: ${{ inputs.run-only-recorded-tests == 'false' }}
       shell: bash
       working-directory: azure-devops
-    - run: pytest tests --junitxml "TEST-results.xml"
+    - run: pytest tests --junitxml "TEST-results.xml" --ignore=azext_devops/tests/latest/integrationtests
       if: ${{ inputs.run-only-recorded-tests == 'true' }}
       shell: bash
diff --git a/.github/workflows/merge-workflow.yml b/.github/workflows/merge-workflow.yml
@@ -120,7 +120,7 @@ jobs:
       - uses: ./.github/actions/setup-ci-machine
       - uses: ./.github/actions/download-install-local-azure-devops-cli-extension
       - name: Run unit tests for code coverage
-        run: pytest --junitxml "TEST-UT-results.xml" --cov=azext_devops/dev --cov-report=xml --cov-report=html
+        run: pytest --junitxml "TEST-UT-results.xml" --cov=azext_devops/dev --cov-report=xml --cov-report=html --ignore=azext_devops/tests/latest/integrationtests
         working-directory: 'azure-devops'
       - name: Install beautifulsoup4
         run: pip install beautifulsoup4

diff --git a/.github/workflows/pr-workflow.yml b/.github/workflows/pr-workflow.yml
@@ -127,7 +127,7 @@ jobs:
       - uses: ./.github/actions/setup-ci-machine
       - uses: ./.github/actions/download-install-local-azure-devops-cli-extension
       - name: Run unit tests for code coverage
-        run: pytest --junitxml "TEST-UT-results.xml" --cov=azext_devops/dev --cov-report=xml --cov-report=html
+        run: pytest --junitxml "TEST-UT-results.xml" --cov=azext_devops/dev --cov-report=xml --cov-report=html --ignore=azext_devops/tests/latest/integrationtests
         working-directory: 'azure-devops'
       - name: Install beautifulsoup4
         run: pip install beautifulsoup4

diff --git a/.github/workflows/released-version.yml b/.github/workflows/released-version.yml
@@ -0,0 +1,34 @@
+name: Released Version Workflow
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  Run_Test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.12'
+
+      - name: Set up virtual environment
+        run: |
+          python -m venv env
+          source env/bin/activate
+          pip install wheel==0.30.0 setuptools==70.0.0
+          pip install azdev
+          azdev --version
+          azdev setup -r ./ -e azure-devops
+          azdev extension repo add .
+          azdev extension add azure-devops
+          azdev test azure-devops --live --no-exitfirst --series
+        env:
+          AZURE_DEVOPS_EXT_TEST_ORG: ${{ variables.AZURE_DEVOPS_EXT_TEST_ORG }}
+          AZURE_DEVOPS_EXT_PAT: ${{ secrets.AZURE_DEVOPS_EXT_PAT }}
+
diff --git a/azure-devops/azext_devops/test/__init__.py → azure-devops/azext_devops/tests/__init__.py b/azure-devops/azext_devops/test/__init__.py → azure-devops/azext_devops/tests/__init__.py
diff --git a/azure-devops/azext_devops/test/conftest.py → azure-devops/azext_devops/tests/conftest.py b/azure-devops/azext_devops/test/conftest.py → azure-devops/azext_devops/tests/conftest.py
diff --git a/...s/azext_devops/test/artifacts/__init__.py → ...devops/tests/latest/artifacts/__init__.py b/...s/azext_devops/test/artifacts/__init__.py → ...devops/tests/latest/artifacts/__init__.py
diff --git a/...xt_devops/test/artifacts/test_univeral.py → ...s/tests/latest/artifacts/test_univeral.py b/...xt_devops/test/artifacts/test_univeral.py → ...s/tests/latest/artifacts/test_univeral.py
diff --git a/...vops/azext_devops/test/boards/__init__.py → ...xt_devops/tests/latest/boards/__init__.py b/...vops/azext_devops/test/boards/__init__.py → ...xt_devops/tests/latest/boards/__init__.py
diff --git a/...ops/azext_devops/test/boards/test_area.py → ...t_devops/tests/latest/boards/test_area.py b/...ops/azext_devops/test/boards/test_area.py → ...t_devops/tests/latest/boards/test_area.py
@@ -15,8 +15,8 @@
 from azext_devops.devops_sdk.v5_0.work.models import (TeamFieldValue,
                                                       TeamFieldValuesPatch)
 from azext_devops.dev.common.services import clear_connection_cache
-from azext_devops.test.utils.authentication import AuthenticatedTests
-from azext_devops.test.utils.helper import get_client_mock_helper
+from azext_devops.tests.utils.authentication import AuthenticatedTests
+from azext_devops.tests.utils.helper import get_client_mock_helper
 from azext_devops.dev.boards.area import (get_project_areas,
                                           get_project_area,
                                           delete_project_area,

diff --git a/..._devops/test/boards/test_boards_helper.py → ...tests/latest/boards/test_boards_helper.py b/..._devops/test/boards/test_boards_helper.py → ...tests/latest/boards/test_boards_helper.py
diff --git a/...zext_devops/test/boards/test_iteration.py → ...ops/tests/latest/boards/test_iteration.py b/...zext_devops/test/boards/test_iteration.py → ...ops/tests/latest/boards/test_iteration.py
@@ -13,8 +13,8 @@
     from mock import patch
 
 from azext_devops.dev.common.services import clear_connection_cache
-from azext_devops.test.utils.authentication import AuthenticatedTests
-from azext_devops.test.utils.helper import get_client_mock_helper
+from azext_devops.tests.utils.authentication import AuthenticatedTests
+from azext_devops.tests.utils.helper import get_client_mock_helper
 from azext_devops.dev.boards.iteration import (get_project_iterations,
                                                get_project_iteration,
                                                delete_project_iteration,

diff --git a/...azext_devops/test/boards/test_workitem.py → ...vops/tests/latest/boards/test_workitem.py b/...azext_devops/test/boards/test_workitem.py → ...vops/tests/latest/boards/test_workitem.py
@@ -15,8 +15,8 @@
 from azext_devops.dev.boards.work_item import (delete_work_item,
                                             show_work_item)
 from azext_devops.dev.common.services import clear_connection_cache
-from azext_devops.test.utils.helper import get_client_mock_helper, TEST_DEVOPS_ORG_URL
-from azext_devops.test.utils.authentication import AuthenticatedTests
+from azext_devops.tests.utils.helper import get_client_mock_helper, TEST_DEVOPS_ORG_URL
+from azext_devops.tests.utils.authentication import AuthenticatedTests
 
 
 class TestWorkItemMethods(AuthenticatedTests):

diff --git a/...vops/azext_devops/test/common/__init__.py → ...xt_devops/tests/latest/common/__init__.py b/...vops/azext_devops/test/common/__init__.py → ...xt_devops/tests/latest/common/__init__.py
diff --git a/...zext_devops/test/common/test_arguments.py → ...ops/tests/latest/common/test_arguments.py b/...zext_devops/test/common/test_arguments.py → ...ops/tests/latest/common/test_arguments.py
diff --git a/...xt_devops/test/common/test_credentials.py → ...s/tests/latest/common/test_credentials.py b/...xt_devops/test/common/test_credentials.py → ...s/tests/latest/common/test_credentials.py
diff --git a/...s/azext_devops/test/common/test_format.py → ...devops/tests/latest/common/test_format.py b/...s/azext_devops/test/common/test_format.py → ...devops/tests/latest/common/test_format.py
diff --git a/...ext_devops/test/common/test_pip_helper.py → ...ps/tests/latest/common/test_pip_helper.py b/...ext_devops/test/common/test_pip_helper.py → ...ps/tests/latest/common/test_pip_helper.py
diff --git a/...azext_devops/test/common/test_services.py → ...vops/tests/latest/common/test_services.py b/...azext_devops/test/common/test_services.py → ...vops/tests/latest/common/test_services.py
diff --git a/...zext_devops/test/common/test_telemetry.py → ...ops/tests/latest/common/test_telemetry.py b/...zext_devops/test/common/test_telemetry.py → ...ops/tests/latest/common/test_telemetry.py
diff --git a/...vops/azext_devops/test/common/test_uri.py → ...xt_devops/tests/latest/common/test_uri.py b/...vops/azext_devops/test/common/test_uri.py → ...xt_devops/tests/latest/common/test_uri.py
diff --git a/...ops/azext_devops/test/common/test_uuid.py → ...t_devops/tests/latest/common/test_uuid.py b/...ops/azext_devops/test/common/test_uuid.py → ...t_devops/tests/latest/common/test_uuid.py
diff --git a/...ops/test/common/test_vsts_git_url_info.py → ...s/latest/common/test_vsts_git_url_info.py b/...ops/test/common/test_vsts_git_url_info.py → ...s/latest/common/test_vsts_git_url_info.py
diff --git a/...evops/azext_devops/test/utils/__init__.py → ...tests/latest/integrationtests/__init__.py b/...evops/azext_devops/test/utils/__init__.py → ...tests/latest/integrationtests/__init__.py
diff --git a/...admin_banner_addUpdateShowListRemove.yaml → ...admin_banner_addUpdateShowListRemove.yaml b/...admin_banner_addUpdateShowListRemove.yaml → ...admin_banner_addUpdateShowListRemove.yaml
diff --git a/tests/recordings/test_boards_areas.yaml → ...ontests/recordings/test_boards_areas.yaml b/tests/recordings/test_boards_areas.yaml → ...ontests/recordings/test_boards_areas.yaml
diff --git a/tests/recordings/test_boards_iterations.yaml → ...ts/recordings/test_boards_iterations.yaml b/tests/recordings/test_boards_iterations.yaml → ...ts/recordings/test_boards_iterations.yaml
diff --git a/...test_boards_releations_create_remove.yaml → ...test_boards_releations_create_remove.yaml b/...test_boards_releations_create_remove.yaml → ...test_boards_releations_create_remove.yaml
diff --git a/tests/recordings/test_build_cancel.yaml → ...ontests/recordings/test_build_cancel.yaml b/tests/recordings/test_build_cancel.yaml → ...ontests/recordings/test_build_cancel.yaml
diff --git a/...dings/test_build_definition_listShow.yaml → ...dings/test_build_definition_listShow.yaml b/...dings/test_build_definition_listShow.yaml → ...dings/test_build_definition_listShow.yaml
diff --git a/.../recordings/test_build_listQueueShow.yaml → .../recordings/test_build_listQueueShow.yaml b/.../recordings/test_build_listQueueShow.yaml → .../recordings/test_build_listQueueShow.yaml
diff --git a/...ordings/test_build_tag_listAddDelete.yaml → ...ordings/test_build_tag_listAddDelete.yaml b/...ordings/test_build_tag_listAddDelete.yaml → ...ordings/test_build_tag_listAddDelete.yaml
diff --git a/...s/test_devops_group_and_member_tests.yaml → ...s/test_devops_group_and_member_tests.yaml b/...s/test_devops_group_and_member_tests.yaml → ...s/test_devops_group_and_member_tests.yaml
diff --git a/...devops_projects_CreateListShowDelete.yaml → ...devops_projects_CreateListShowDelete.yaml b/...devops_projects_CreateListShowDelete.yaml → ...devops_projects_CreateListShowDelete.yaml
diff --git a/...est_devops_security_permission_tests.yaml → ...est_devops_security_permission_tests.yaml b/...est_devops_security_permission_tests.yaml → ...est_devops_security_permission_tests.yaml
diff --git a/...createUpdateShowListDeleteListMember.yaml → ...createUpdateShowListDeleteListMember.yaml b/...createUpdateShowListDeleteListMember.yaml → ...createUpdateShowListDeleteListMember.yaml
diff --git a/...user_command_addUpdateListShowRemove.yaml → ...user_command_addUpdateListShowRemove.yaml b/...user_command_addUpdateListShowRemove.yaml → ...user_command_addUpdateListShowRemove.yaml
diff --git a/tests/recordings/test_extension_search.yaml → ...sts/recordings/test_extension_search.yaml b/tests/recordings/test_extension_search.yaml → ...sts/recordings/test_extension_search.yaml
diff --git a/...recordings/test_invoke_command_basic.yaml → ...recordings/test_invoke_command_basic.yaml b/...recordings/test_invoke_command_basic.yaml → ...recordings/test_invoke_command_basic.yaml
diff --git a/...t_pipeline_create_and_variables_test.yaml → ...t_pipeline_create_and_variables_test.yaml b/...t_pipeline_create_and_variables_test.yaml → ...t_pipeline_create_and_variables_test.yaml
diff --git a/tests/recordings/test_pipeline_folders.yaml → ...sts/recordings/test_pipeline_folders.yaml b/tests/recordings/test_pipeline_folders.yaml → ...sts/recordings/test_pipeline_folders.yaml
diff --git a/...dings/test_pipeline_pools_and_agents.yaml → ...dings/test_pipeline_pools_and_agents.yaml b/...dings/test_pipeline_pools_and_agents.yaml → ...dings/test_pipeline_pools_and_agents.yaml
diff --git a/tests/recordings/test_pipeline_queues.yaml → ...ests/recordings/test_pipeline_queues.yaml b/tests/recordings/test_pipeline_queues.yaml → ...ests/recordings/test_pipeline_queues.yaml
diff --git a/...stAbandonReactivateCompleteReviewers.yaml → ...stAbandonReactivateCompleteReviewers.yaml b/...stAbandonReactivateCompleteReviewers.yaml → ...stAbandonReactivateCompleteReviewers.yaml
diff --git a/...test_pull_request_policies_workitems.yaml → ...test_pull_request_policies_workitems.yaml b/...test_pull_request_policies_workitems.yaml → ...test_pull_request_policies_workitems.yaml
diff --git a/tests/recordings/test_queryShow.yaml → ...ationtests/recordings/test_queryShow.yaml b/tests/recordings/test_queryShow.yaml → ...ationtests/recordings/test_queryShow.yaml
diff --git a/...recordings/test_ref_createDeleteFlow.yaml → ...recordings/test_ref_createDeleteFlow.yaml b/...recordings/test_ref_createDeleteFlow.yaml → ...recordings/test_ref_createDeleteFlow.yaml
diff --git a/...ings/test_ref_createListUpdateDelete.yaml → ...ings/test_ref_createListUpdateDelete.yaml b/...ings/test_ref_createListUpdateDelete.yaml → ...ings/test_ref_createListUpdateDelete.yaml
diff --git a/...ings/test_repos_createListShowDelete.yaml → ...ings/test_repos_createListShowDelete.yaml b/...ings/test_repos_createListShowDelete.yaml → ...ings/test_repos_createListShowDelete.yaml
diff --git a/.../recordings/test_repos_import_create.yaml → .../recordings/test_repos_import_create.yaml b/.../recordings/test_repos_import_create.yaml → .../recordings/test_repos_import_create.yaml
diff --git a/..._policies_createUpdateShowListDelete.yaml → ..._policies_createUpdateShowListDelete.yaml b/..._policies_createUpdateShowListDelete.yaml → ..._policies_createUpdateShowListDelete.yaml
diff --git a/tests/recordings/test_variable_group.yaml → ...tests/recordings/test_variable_group.yaml b/tests/recordings/test_variable_group.yaml → ...tests/recordings/test_variable_group.yaml
diff --git a/...t_wiki_and_page_createListShowDelete.yaml → ...t_wiki_and_page_createListShowDelete.yaml b/...t_wiki_and_page_createListShowDelete.yaml → ...t_wiki_and_page_createListShowDelete.yaml
diff --git a/.../test_workItemCreateShowUpdateDelete.yaml → .../test_workItemCreateShowUpdateDelete.yaml b/.../test_workItemCreateShowUpdateDelete.yaml → .../test_workItemCreateShowUpdateDelete.yaml
diff --git a/tests/test_adminBannerTest.py → .../integrationtests/test_adminBannerTest.py b/tests/test_adminBannerTest.py → .../integrationtests/test_adminBannerTest.py
@@ -7,7 +7,7 @@
 import unittest
 
 from datetime import datetime
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/azuredevopsclitest'

diff --git a/tests/test_boardsAreaTest.py → ...t/integrationtests/test_boardsAreaTest.py b/tests/test_boardsAreaTest.py → ...t/integrationtests/test_boardsAreaTest.py
@@ -6,7 +6,7 @@
 import unittest
 from knack.util import CLIError
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/ishitamehta'

diff --git a/tests/test_boardsIterationTest.py → ...egrationtests/test_boardsIterationTest.py b/tests/test_boardsIterationTest.py → ...egrationtests/test_boardsIterationTest.py
@@ -6,7 +6,7 @@
 import unittest
 from knack.util import CLIError
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_boardsQueryTest.py → .../integrationtests/test_boardsQueryTest.py b/tests/test_boardsQueryTest.py → .../integrationtests/test_boardsQueryTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_boardsRelationTest.py → ...tegrationtests/test_boardsRelationTest.py b/tests/test_boardsRelationTest.py → ...tegrationtests/test_boardsRelationTest.py
@@ -5,7 +5,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_boardsWorkItemTest.py → ...tegrationtests/test_boardsWorkItemTest.py b/tests/test_boardsWorkItemTest.py → ...tegrationtests/test_boardsWorkItemTest.py
@@ -8,7 +8,7 @@
 import pytest
 
 from knack.util import CLIError
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_devopsProjectTest.py → ...ntegrationtests/test_devopsProjectTest.py b/tests/test_devopsProjectTest.py → ...ntegrationtests/test_devopsProjectTest.py
@@ -7,7 +7,7 @@
 import unittest
 import json
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/azuredevopsclitest'

diff --git a/tests/test_devopsSecurityGroupTest.py → ...tiontests/test_devopsSecurityGroupTest.py b/tests/test_devopsSecurityGroupTest.py → ...tiontests/test_devopsSecurityGroupTest.py
@@ -5,7 +5,7 @@
 
 import unittest
 from knack.util import CLIError
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_devopsSecurityPermissionTest.py → ...ests/test_devopsSecurityPermissionTest.py b/tests/test_devopsSecurityPermissionTest.py → ...ests/test_devopsSecurityPermissionTest.py
@@ -5,7 +5,7 @@
 
 import unittest
 from knack.util import CLIError
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_devopsTeamTest.py → ...t/integrationtests/test_devopsTeamTest.py b/tests/test_devopsTeamTest.py → ...t/integrationtests/test_devopsTeamTest.py
@@ -5,7 +5,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/azuredevopsclitest'

diff --git a/tests/test_devopsUserTest.py → ...t/integrationtests/test_devopsUserTest.py b/tests/test_devopsUserTest.py → ...t/integrationtests/test_devopsUserTest.py
@@ -5,7 +5,7 @@
 
 import unittest
 from knack.util import CLIError
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_extensionSearch.py → .../integrationtests/test_extensionSearch.py b/tests/test_extensionSearch.py → .../integrationtests/test_extensionSearch.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry
 
 class ExtensionSearchTest(DevopsScenarioTest):

diff --git a/tests/test_gitAliasTest.py → ...est/integrationtests/test_gitAliasTest.py b/tests/test_gitAliasTest.py → ...est/integrationtests/test_gitAliasTest.py
diff --git a/tests/test_invoke.py → ...ts/latest/integrationtests/test_invoke.py b/tests/test_invoke.py → ...ts/latest/integrationtests/test_invoke.py
@@ -5,7 +5,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'https://dev.azure.com/azuredevopsclitest'

diff --git a/tests/test_pipelineAgentPoolQueueTest.py → ...ntests/test_pipelineAgentPoolQueueTest.py b/tests/test_pipelineAgentPoolQueueTest.py → ...ntests/test_pipelineAgentPoolQueueTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/azuredevopsclitest'

diff --git a/tests/test_pipelineFoldersTest.py → ...egrationtests/test_pipelineFoldersTest.py b/tests/test_pipelineFoldersTest.py → ...egrationtests/test_pipelineFoldersTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/azuredevopsclitest'

diff --git a/tests/test_pipelinesBuildCancelTest.py → ...iontests/test_pipelinesBuildCancelTest.py b/tests/test_pipelinesBuildCancelTest.py → ...iontests/test_pipelinesBuildCancelTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/dhilmathy'

diff --git a/tests/test_pipelinesBuildDefinitionsTest.py → ...sts/test_pipelinesBuildDefinitionsTest.py b/tests/test_pipelinesBuildDefinitionsTest.py → ...sts/test_pipelinesBuildDefinitionsTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/azuredevopsclitest'

diff --git a/tests/test_pipelinesBuildTagTest.py → ...rationtests/test_pipelinesBuildTagTest.py b/tests/test_pipelinesBuildTagTest.py → ...rationtests/test_pipelinesBuildTagTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_pipelinesBuildTest.py → ...tegrationtests/test_pipelinesBuildTest.py b/tests/test_pipelinesBuildTest.py → ...tegrationtests/test_pipelinesBuildTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/v-anvashist0376'

diff --git a/...s/test_pipelinesCreateAndVariablesTest.py → ...s/test_pipelinesCreateAndVariablesTest.py b/...s/test_pipelinesCreateAndVariablesTest.py → ...s/test_pipelinesCreateAndVariablesTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_reposImportTest.py → .../integrationtests/test_reposImportTest.py b/tests/test_reposImportTest.py → .../integrationtests/test_reposImportTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable, get_random_name
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/v-anvashist0376'

diff --git a/tests/test_reposPoliciesTest.py → ...ntegrationtests/test_reposPoliciesTest.py b/tests/test_reposPoliciesTest.py → ...ntegrationtests/test_reposPoliciesTest.py
@@ -5,7 +5,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import DevopsScenarioTest, disable_telemetry, set_authentication, get_test_org_from_env_variable
 
 DEVOPS_CLI_TEST_ORGANIZATION = get_test_org_from_env_variable() or 'Https://dev.azure.com/azuredevopsclitest'
@@ -53,7 +53,7 @@ def test_repos_policies_createUpdateShowListDelete(self):
             show_policy_output = self.cmd(show_policy_command).get_output_in_json()
             assert show_policy_output["id"] == policy_id
             assert show_policy_output["type"]["id"] == 'fa4e907d-c16b-4a4c-9dfa-4916e5d171ab' #id of merge strategy policy
-            self.failUnlessRaises(KeyError, lambda: show_policy_output["settings"]["useSquashMerge"])
+            self.assertRaises(KeyError, lambda: show_policy_output["settings"]["useSquashMerge"])
 
             update_policy_command = 'az repos policy merge-strategy update --id ' + str(policy_id) + ' --use-squash-merge True --output json --detect false'
             update_policy_output = self.cmd(update_policy_command).get_output_in_json()
@@ -74,8 +74,8 @@ def test_repos_policies_createUpdateShowListDelete(self):
             self.sleep_in_live_run(5)
 
             show_policy_output = self.cmd(show_policy_command).get_output_in_json()
-            self.failUnlessRaises(KeyError, lambda: show_policy_output["settings"]["useSquashMerge"])
-            self.failUnlessRaises(KeyError, lambda: show_policy_output["settings"]["allowSquash"])
+            self.assertRaises(KeyError, lambda: show_policy_output["settings"]["useSquashMerge"])
+            self.assertRaises(KeyError, lambda: show_policy_output["settings"]["allowSquash"])
             assert show_policy_output["settings"]["allowRebase"] == True
 
             delete_policy_command = 'az repos policy delete --id ' + str(policy_id) + ' -p ' + created_project_id + ' --output json --detect false -y'
@@ -103,8 +103,8 @@ def test_repos_policies_createUpdateShowListDelete(self):
 
             show_policy_command = 'az repos policy show --id ' + str(policy_id) + ' -p ' + created_project_id + ' --output json --detect false'
             show_policy_output = self.cmd(show_policy_command).get_output_in_json()
-            self.failUnlessRaises(KeyError, lambda: show_policy_output["settings"]["useSquashMerge"])
-            self.failUnlessRaises(KeyError, lambda: show_policy_output["settings"]["allowRebase"])
+            self.assertRaises(KeyError, lambda: show_policy_output["settings"]["useSquashMerge"])
+            self.assertRaises(KeyError, lambda: show_policy_output["settings"]["allowRebase"])
             assert show_policy_output["settings"]["allowSquash"] == True
             assert show_policy_output["settings"]["allowRebaseMerge"] == True
 

diff --git a/tests/test_reposPrCommandsReviewersTest.py → ...ests/test_reposPrCommandsReviewersTest.py b/tests/test_reposPrCommandsReviewersTest.py → ...ests/test_reposPrCommandsReviewersTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from dateutil import parser
 from .utilities.helper import (
     DevopsScenarioTest, get_random_name, disable_telemetry, set_authentication, get_test_org_from_env_variable)

diff --git a/tests/test_reposPrPoliciesWorkItemsTest.py → ...ests/test_reposPrPoliciesWorkItemsTest.py b/tests/test_reposPrPoliciesWorkItemsTest.py → ...ests/test_reposPrPoliciesWorkItemsTest.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from datetime import datetime
 from .utilities.helper import (
     DevopsScenarioTest, get_random_name, disable_telemetry, set_authentication, get_test_org_from_env_variable)
@@ -18,17 +18,17 @@ class AzReposPrPolicyTests(DevopsScenarioTest):
     @disable_telemetry
     @set_authentication
     def test_pull_request_policies_workitems(self):
-        self.cmd('az devops configure --defaults organization=' + DEVOPS_CLI_TEST_ORGANIZATION)
-
+        self.cmd('az devops configure --defaults organization=' + DEVOPS_CLI_TEST_ORGANIZATION) 
+         
         #List PR
         pr_list = self.cmd('az repos pr list --project PullRequestLiveTest --repository PullRequestLiveTest --detect false --output json', checks=[
             self.check("[0].description", 'Updated README.md'),
             self.check("[1].description", 'Updated README.md'),
         ]).get_output_in_json()
         assert len(pr_list) > 0
 
-        pr_id_to_query = pr_list[1]["pullRequestId"]
-        
+        pr_id_to_query = pr_list[1]["pullRequestId"] 
+
         #PR Policies list command
         list_pr_policies_command = 'az repos pr policy list --id ' + str(pr_id_to_query) + ' --detect false --output json'
         list_pr_policies_output = self.cmd(list_pr_policies_command).get_output_in_json()
@@ -44,8 +44,8 @@ def test_pull_request_policies_workitems(self):
         assert queue_pr_policy_output["status"] == 'queued'
 
         #PR work-item add command
-        work_item_ids_to_add = '1 2'
-        work_item_id_to_remove = '2'
+        work_item_ids_to_add = '129 130'
+        work_item_id_to_remove = '130'
 
         add_wit_pr_command = ('az repos pr work-item add --id ' + str(pr_id_to_query) + ' --work-items ' + work_item_ids_to_add + 
             ' --detect false --output json')
@@ -63,7 +63,7 @@ def test_pull_request_policies_workitems(self):
         self.cmd(remove_wit_pr_command)
         #verify removed
         list_wit_pr_output = self.cmd(list_wit_pr_command, checks=[
-            self.check("[0].id", "1")
+            self.check("[0].id", "129")
         ]).get_output_in_json()
         assert len(list_wit_pr_output) == 1
 
diff --git a/tests/test_reposRefDeleteFlowTest.py → ...ationtests/test_reposRefDeleteFlowTest.py b/tests/test_reposRefDeleteFlowTest.py → ...ationtests/test_reposRefDeleteFlowTest.py
@@ -5,7 +5,7 @@
 
 import os
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from .utilities.helper import (DevopsScenarioTest,
                                disable_telemetry,
                                get_random_name,