Skip to content

fix: Add missing arg in wait function which overwrites parent function #2574

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
merged 2 commits into from
Nov 14, 2025
Merged

fix: Add missing arg in wait function which overwrites parent function #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cf126
Add missing arg in wait function which overwrites parent function
rnetser Nov 13, 2025
6308b7b
Merge branch 'main' into fix-sleep-wait
myakove Nov 14, 2025
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
5 changes: 3 additions & 2 deletions ocp_resources/datavolume.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,16 @@ def wait_deleted(self, timeout=TIMEOUT_4MINUTES):
super().wait_deleted(timeout=timeout)
return self.pvc.wait_deleted(timeout=timeout)

def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES, wait_for_exists_only=False):
def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES, wait_for_exists_only=False, sleep=1):
if wait_for_exists_only:
return super().wait(timeout=timeout)
return super().wait(timeout=timeout, sleep=sleep)
else:
self._check_none_pending_status(failure_timeout=failure_timeout)

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

@property
def pvc(self):
Expand Down
3 changes: 2 additions & 1 deletion ocp_resources/virtual_machine_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,12 @@ def wait(
cond_reason=SucceededConditionReason.VIRTUAL_MACHINE_READY,
cond_status=Condition.Status.TRUE,
cond_type=Condition.SUCCEEDED,
sleep=1,
):
self.logger.info(f"Wait for {self.kind} {self.name} {cond_reason} condition to be {cond_status}")
samples = TimeoutSampler(
wait_timeout=timeout,
sleep=1,
sleep=sleep,
exceptions_dict=PROTOCOL_ERROR_EXCEPTION_DICT,
func=self.api.get,
field_selector=f"metadata.name=={self.name}",
Expand Down