From 5fc532045c12cbaefdff1a02c7d34b7356f430a6 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Tue, 17 Sep 2019 22:45:57 +0530 Subject: Add waiter for multiple resources absence Add new function called 'wait_for_resources_absence', which allows us to wait for absense of multiple resources using single timeout. Also, reuse this new function in the baseclass.py for PVC/PV removal waitings. Change-Id: I6e3daae012199e50d3aeb68b697cfae801b0b49b --- openshift-storage-libs/openshiftstoragelibs/baseclass.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openshift-storage-libs/openshiftstoragelibs/baseclass.py') diff --git a/openshift-storage-libs/openshiftstoragelibs/baseclass.py b/openshift-storage-libs/openshiftstoragelibs/baseclass.py index c8cb1d37..156aee86 100644 --- a/openshift-storage-libs/openshiftstoragelibs/baseclass.py +++ b/openshift-storage-libs/openshiftstoragelibs/baseclass.py @@ -35,7 +35,7 @@ from openshiftstoragelibs.openshift_ops import ( scale_dcs_pod_amount_and_wait, switch_oc_project, verify_pvc_status_is_bound, - wait_for_resource_absence, + wait_for_resources_absence, ) from openshiftstoragelibs.openshift_storage_libs import ( get_iscsi_block_devices_by_path, @@ -245,8 +245,8 @@ class BaseClass(unittest.TestCase): node, sc_name, pvc_name_prefix=pvc_name_prefix, pvc_size=pvc_size) pvc_names.append(pvc_name) - self.addCleanup( - wait_for_resource_absence, node, 'pvc', pvc_name) + self.addCleanup( + wait_for_resources_absence, node, 'pvc', pvc_names) # Wait for PVCs to be in bound state try: -- cgit