Skip to content

Commit a5e2d4b

Browse files
rnetsermyakove
andauthored
Add missing arg in wait function which overwrites parent function (#2574)
Co-authored-by: Meni Yakove <441263+myakove@users.noreply.github.com>
1 parent e1e028b commit a5e2d4b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

ocp_resources/datavolume.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,16 @@ def wait_deleted(self, timeout=TIMEOUT_4MINUTES):
248248
super().wait_deleted(timeout=timeout)
249249
return self.pvc.wait_deleted(timeout=timeout)
250250

251-
def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES, wait_for_exists_only=False):
251+
def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES, wait_for_exists_only=False, sleep=1):
252252
if wait_for_exists_only:
253-
return super().wait(timeout=timeout)
253+
return super().wait(timeout=timeout, sleep=sleep)
254254
else:
255255
self._check_none_pending_status(failure_timeout=failure_timeout)
256256

257257
# If DV's status is not Pending, continue with the flow
258258
self.wait_for_status(status=self.Status.SUCCEEDED, timeout=timeout)
259259
self.pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=timeout)
260+
return None
260261

261262
@property
262263
def pvc(self):

ocp_resources/virtual_machine_import.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,12 @@ def wait(
195195
cond_reason=SucceededConditionReason.VIRTUAL_MACHINE_READY,
196196
cond_status=Condition.Status.TRUE,
197197
cond_type=Condition.SUCCEEDED,
198+
sleep=1,
198199
):
199200
self.logger.info(f"Wait for {self.kind} {self.name} {cond_reason} condition to be {cond_status}")
200201
samples = TimeoutSampler(
201202
wait_timeout=timeout,
202-
sleep=1,
203+
sleep=sleep,
203204
exceptions_dict=PROTOCOL_ERROR_EXCEPTION_DICT,
204205
func=self.api.get,
205206
field_selector=f"metadata.name=={self.name}",

0 commit comments

Comments
 (0)