Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/merge-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion azure-devops/azext_devops/dev/boards/boards_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.')
3 changes: 2 additions & 1 deletion azure-devops/azext_devops/tests/utils/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading