diff options
| author | Krishnaram Karthick Ramdoss <kramdoss@redhat.com> | 2018-05-17 17:55:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.host.prod.eng.bos.redhat.com> | 2018-05-17 17:55:48 +0000 |
| commit | 91ca961fe54712e16b6b8d7cdbbf95db0818c951 (patch) | |
| tree | 624bf0571d0778eaa0c75838e11fdb1ae11bfc28 /tests/functional | |
| parent | 2bee3d332568b1e153b8a46c59253a750feea8e5 (diff) | |
| parent | 52b1935f16511521c6b1ec6de4850b0fc1c89997 (diff) | |
Merge "CNS: fixing heketi testcases that are failing"
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/common/heketi/test_volume_expansion_and_devices.py | 8 | ||||
| -rw-r--r-- | tests/functional/common/heketi/test_volume_multi_req.py | 11 |
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) |