Skip to content

Commit 74e964a

Browse files
committed
Update waiting during test
1 parent 139e6e1 commit 74e964a

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9096,7 +9096,8 @@ def create_new_cluster_with_monitoring_aad_auth(self, resource_group, resource_g
90969096

90979097
# wait for any in-progress cluster operation to finish before disabling
90989098
self.cmd(f'aks wait -g {resource_group} -n {aks_name} --updated --interval 30 --timeout 600')
9099-
time.sleep(60)
9099+
if self.is_live or self.in_recording:
9100+
time.sleep(60)
91009101

91019102
# make sure monitoring can be smoothly disabled, retry on 409 (in-progress addon operation)
91029103
for attempt in range(6):
@@ -9105,7 +9106,8 @@ def create_new_cluster_with_monitoring_aad_auth(self, resource_group, resource_g
91059106
break
91069107
except Exception:
91079108
if attempt < 5:
9108-
time.sleep(60)
9109+
if self.is_live or self.in_recording:
9110+
time.sleep(60)
91099111
else:
91109112
raise
91119113

@@ -9200,7 +9202,8 @@ def enable_monitoring_existing_cluster_aad_auth(self, resource_group, resource_g
92009202

92019203
# wait for any in-progress cluster operation to finish before disabling
92029204
self.cmd(f'aks wait -g {resource_group} -n {aks_name} --updated --interval 30 --timeout 600')
9203-
time.sleep(60)
9205+
if self.is_live or self.in_recording:
9206+
time.sleep(60)
92049207

92059208
# make sure monitoring can be smoothly disabled, retry on 409 (in-progress addon operation)
92069209
for attempt in range(6):
@@ -9209,7 +9212,8 @@ def enable_monitoring_existing_cluster_aad_auth(self, resource_group, resource_g
92099212
break
92109213
except Exception:
92119214
if attempt < 5:
9212-
time.sleep(60)
9215+
if self.is_live or self.in_recording:
9216+
time.sleep(60)
92139217
else:
92149218
raise
92159219

@@ -9264,7 +9268,8 @@ def test_aks_create_with_monitoring_legacy_auth(self, resource_group, resource_g
92649268

92659269
# wait for any in-progress cluster operation to finish before disabling
92669270
self.cmd(f'aks wait -g {resource_group} -n {aks_name} --updated --interval 30 --timeout 600')
9267-
time.sleep(60)
9271+
if self.is_live or self.in_recording:
9272+
time.sleep(60)
92689273

92699274
# make sure monitoring can be smoothly disabled, retry on 409 (in-progress addon operation)
92709275
for attempt in range(6):
@@ -9273,7 +9278,8 @@ def test_aks_create_with_monitoring_legacy_auth(self, resource_group, resource_g
92739278
break
92749279
except Exception:
92759280
if attempt < 5:
9276-
time.sleep(60)
9281+
if self.is_live or self.in_recording:
9282+
time.sleep(60)
92779283
else:
92789284
raise
92799285

0 commit comments

Comments
 (0)