summaryrefslogtreecommitdiffstats
path: root/tests/functional/common/heketi
diff options
context:
space:
mode:
authorApeksha D Khakharia <akhakhar@redhat.com>2018-05-10 13:24:40 +0530
committerApeksha D Khakharia <akhakhar@redhat.com>2018-05-14 15:26:13 +0530
commit52b1935f16511521c6b1ec6de4850b0fc1c89997 (patch)
treed01675cb586d9b3c21af0bd3bdf48d658e0cd920 /tests/functional/common/heketi
parentdba66954f5b012ec6132c050317fa8f437d28fb5 (diff)
CNS: fixing heketi testcases that are failing
Also removing the skip decorator, the testcase logic have no issues and it passes when executed individually Change-Id: Iede3f6b67ddd79d0efc673b2b3440fba392540d4 Signed-off-by: Apeksha D Khakharia <akhakhar@redhat.com>
Diffstat (limited to 'tests/functional/common/heketi')
-rw-r--r--tests/functional/common/heketi/test_volume_expansion_and_devices.py8
-rw-r--r--tests/functional/common/heketi/test_volume_multi_req.py11
2 files changed, 4 insertions, 15 deletions
diff --git a/tests/functional/common/heketi/test_volume_expansion_and_devices.py b/tests/functional/common/heketi/test_volume_expansion_and_devices.py
index c5c60913..2732d933 100644
--- a/tests/functional/common/heketi/test_volume_expansion_and_devices.py
+++ b/tests/functional/common/heketi/test_volume_expansion_and_devices.py
@@ -331,10 +331,6 @@ class TestVolumeExpansionAndDevicesTestCases(HeketiClientSetupBaseClass):
self.get_brick_and_volume_status(volume_name)
- @unittest.skip("Failure of this test messes up the test system "
- "for other tests to pass. So, this test is "
- "skipped temporarily until failure case is "
- "handled.")
def test_volume_expansion_expanded_volume(self):
"""
To test volume expansion with brick and rebalance
@@ -642,10 +638,6 @@ class TestVolumeExpansionAndDevicesTestCases(HeketiClientSetupBaseClass):
free_space_after_deletion > free_space_after_expansion,
"Free space not reclaimed after deletion of volume %s" % volume_id)
- @unittest.skip("Failure of this test messes up the test system "
- "for other tests to pass. So, this test is "
- "skipped temporarily until failure case is "
- "handled.")
@podcmd.GlustoPod()
def test_volume_expansion_rebalance_brick(self):
"""
diff --git a/tests/functional/common/heketi/test_volume_multi_req.py b/tests/functional/common/heketi/test_volume_multi_req.py
index 0a33f2a7..5e944e6c 100644
--- a/tests/functional/common/heketi/test_volume_multi_req.py
+++ b/tests/functional/common/heketi/test_volume_multi_req.py
@@ -378,10 +378,6 @@ class TestVolumeMultiReq(HeketiClientSetupBaseClass):
c.update_pv_info(ocp_node)
self.assertIn(c.heketiVolumeName, now_vols)
- @unittest.skip("Failure of this test messes up the test system "
- "for other tests to pass. So, this test is "
- "skipped temporarily until failure case is "
- "handled.")
def test_create_delete_volumes_concurrently(self):
"""Test creating volume when "other processes" are creating
and deleting other volumes in the background.
@@ -399,8 +395,9 @@ class TestVolumeMultiReq(HeketiClientSetupBaseClass):
# make this a condition
done = threading.Event()
+ short_tc_name = "volumes-concurrently"
def background_ops():
- subname = make_unique_label(tname)
+ subname = make_unique_label(short_tc_name)
for i, w in enumerate(Waiter(60 * 60)):
time.sleep(random.randint(1, 10) * 0.1)
c = ClaimInfo(
@@ -435,13 +432,13 @@ class TestVolumeMultiReq(HeketiClientSetupBaseClass):
# deploy two persistent volume claims
c1 = ClaimInfo(
- name='-'.join((tname, 'pvc1')),
+ name='-'.join((short_tc_name, 'pvc1')),
storageclass=tname,
size=2)
c1.create_pvc(ocp_node)
self.addCleanup(c1.delete_pvc, ocp_node)
c2 = ClaimInfo(
- name='-'.join((tname, 'pvc2')),
+ name='-'.join((short_tc_name, 'pvc2')),
storageclass=tname,
size=2)
c2.create_pvc(ocp_node)