summaryrefslogtreecommitdiffstats
path: root/openshift-storage-libs
diff options
context:
space:
mode:
authorkasturiNarra <knarra@redhat.com>2019-12-10 18:16:50 +0530
committervponomar <vponomar@redhat.com>2019-12-12 14:36:43 +0000
commitc1b6d23e29daf2da80722317ec2fd67b39523e3f (patch)
treec3a82e5e48f0c072b40e8b5af1e242b6122a2493 /openshift-storage-libs
parentd832892648b5609f1ff0a34bfd9836946b555d69 (diff)
Delete duplicate test "test_to_create_distribute_replicated_vol"
which completely duplicates "test_to_create_and_delete_dist_rep_vol" in 'test_create_distributed_replica_heketi_volume.py' test module & fix cleanup code for create_heketi_volume_with_name_and_wait in openshift-storage-libs/openshiftstoragelibs/baseclass.py module. Change-Id: I9b3dea28e6330e52caab09311e20b65dd48491b9
Diffstat (limited to 'openshift-storage-libs')
-rw-r--r--openshift-storage-libs/openshiftstoragelibs/baseclass.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/openshift-storage-libs/openshiftstoragelibs/baseclass.py b/openshift-storage-libs/openshiftstoragelibs/baseclass.py
index 80f8966..24d0499 100644
--- a/openshift-storage-libs/openshiftstoragelibs/baseclass.py
+++ b/openshift-storage-libs/openshiftstoragelibs/baseclass.py
@@ -415,7 +415,8 @@ class BaseClass(unittest.TestCase):
return self.create_dcs_with_pvc(pvc_name, timeout, wait_step)[pvc_name]
def create_heketi_volume_with_name_and_wait(
- self, name, size, timeout=600, wait_step=10, **kwargs):
+ self, name, size, raise_on_cleanup_error=True,
+ timeout=600, wait_step=10, **kwargs):
json = kwargs.get("json", False)
try:
@@ -445,7 +446,8 @@ class BaseClass(unittest.TestCase):
self.addCleanup(
heketi_volume_delete, self.heketi_client_node,
- self.heketi_server_url, h_volume_info["id"])
+ self.heketi_server_url, h_volume_info["id"],
+ raise_on_error=raise_on_cleanup_error)
return h_volume_info