diff --git a/.github/workflows/merge-workflow.yml b/.github/workflows/merge-workflow.yml index 7172f3e28..2567d4895 100644 --- a/.github/workflows/merge-workflow.yml +++ b/.github/workflows/merge-workflow.yml @@ -87,8 +87,6 @@ jobs: python-version: - '3.12' - '3.11' - - '3.10' - - '3.9' steps: - uses: actions/checkout@v2 - uses: ./.github/actions/run-tests diff --git a/azure-devops/azext_devops/dev/boards/boards_helper.py b/azure-devops/azext_devops/dev/boards/boards_helper.py index 437986e3c..ab4f3c9fc 100644 --- a/azure-devops/azext_devops/dev/boards/boards_helper.py +++ b/azure-devops/azext_devops/dev/boards/boards_helper.py @@ -23,5 +23,7 @@ def resolve_classification_node_path(client, path, project, structure_group): def handle_common_boards_errors(ex): logger.debug(ex, exc_info=True) - raise CLIError(str(ex.message) + "\nPlease see https://aka.ms/azure-devops-cli-troubleshooting " + + # Handle both Python 2 and 3 exception message formats + error_msg = getattr(ex, 'message', str(ex)) + raise CLIError(error_msg + "\nPlease see https://aka.ms/azure-devops-cli-troubleshooting " + 'for more information on troubleshooting common errors.') diff --git a/azure-devops/azext_devops/tests/utils/authentication.py b/azure-devops/azext_devops/tests/utils/authentication.py index 089e5af6d..774ef586f 100644 --- a/azure-devops/azext_devops/tests/utils/authentication.py +++ b/azure-devops/azext_devops/tests/utils/authentication.py @@ -26,5 +26,6 @@ def authentication_setup(self): def authenticate(self): # set return values - self.mock_validate_token.return_value = True + # Return None instead of True to prevent token validation side effects + self.mock_validate_token.return_value = None self.mock_get_credential.return_value = UNIT_TEST_PAT_TOKEN