Skip to content

{Batch} Fix race condition in test #28508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 2 commits into from
Mar 15, 2024
Merged

{Batch} Fix race condition in test #28508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0c6878
Fix race condition
cRui861 Mar 6, 2024
d6d8eea
Additional fix
cRui861 Mar 14, 2024
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
8 changes: 6 additions & 2 deletions src/azure-cli/azure/cli/command_modules/batch/tests/latest/test_batch_mgmt_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

class BatchMgmtScenarioTests(ScenarioTest):

def __init__(self, method_name):
super().__init__(method_name, recording_processors=[
def __init__(self, method_name, *arg, **kwargs):
super().__init__(method_name, *arg, random_config_dir=True, **kwargs, recording_processors=[
BatchAccountKeyReplacer(),
StorageSASReplacer()
])
Expand Down Expand Up @@ -343,6 +343,10 @@ def test_batch_application_cmd(self, resource_group, storage_account):


class BatchMgmtByosScenarioTests(ScenarioTest):

def __init__(self, method_name, *arg, **kwargs):
super().__init__(method_name, *arg, random_config_dir=True, **kwargs)
Comment on lines +347 to +348
Copy link
Member

@jiasli jiasli Mar 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to explicitly specify method_name. It is part of *arg.

Suggested change
def __init__(self, method_name, *arg, **kwargs):
super().__init__(method_name, *arg, random_config_dir=True, **kwargs)
def __init__(self, *arg, **kwargs):
super().__init__(*arg, random_config_dir=True, **kwargs)

Copy link
Member

@jiasli jiasli Mar 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, as this pattern is frequently used elsewhere:

azure-cli/src/azure-cli/azure/cli/command_modules/serviceconnector/tests/latest/test_webpp_connection_scenario.py

Lines 23 to 27 in 21b54b5

def __init__(self, method_name):
super(WebAppConnectionScenarioTest, self).__init__(
method_name,
recording_processors=[CredentialReplacer(), ConfigCredentialReplacer()]
)

You can keep it for now.


@ResourceGroupPreparer(location='eastus')
def test_batch_byos_account_cmd(self):
account_name = self.create_random_name(prefix='clibatchtestacct', length=24)
Expand Down