From 9a79735144ec8caad346feb6897d9e78dfea1a29 Mon Sep 17 00:00:00 2001 From: vamahaja Date: Wed, 10 Jul 2019 22:26:42 +0530 Subject: Fix test cases skipped due to closed bugs Add fix to test cases which are skipped due to bugs - BZ-1644685, BZ-1652913, BZ-1634745, BZ-1635736, BZ-1636477, BZ-1641668 Change-Id: I03a7f7dddaba5d3e41770969352b2263c84cb920 Signed-off-by: vamahaja --- .../test_restart_gluster_services.py | 29 +++++++++++++++++++++- .../provisioning/test_storage_class_cases.py | 15 +++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) (limited to 'tests/functional') diff --git a/tests/functional/gluster_stability/test_restart_gluster_services.py b/tests/functional/gluster_stability/test_restart_gluster_services.py index b68da6b6..85069688 100644 --- a/tests/functional/gluster_stability/test_restart_gluster_services.py +++ b/tests/functional/gluster_stability/test_restart_gluster_services.py @@ -15,7 +15,11 @@ from openshiftstoragelibs.gluster_ops import ( restart_gluster_vol_brick_processes, wait_to_heal_complete, ) -from openshiftstoragelibs.heketi_ops import heketi_blockvolume_list +from openshiftstoragelibs.heketi_ops import ( + heketi_blockvolume_list, + heketi_server_operation_cleanup, + heketi_server_operations_list, +) from openshiftstoragelibs.openshift_ops import ( get_pv_name_from_pvc, match_pv_and_heketi_block_volumes, @@ -139,6 +143,17 @@ class GlusterStabilityTestSetup(GlusterBlockBaseClass): def validate_volumes_and_blocks(self): """Validates PVC and block volumes generated through heketi and OCS """ + heketi_operations = heketi_server_operations_list( + self.heketi_client_node, self.heketi_server_url, + secret=self.heketi_cli_key, user=self.heketi_cli_user) + + for heketi_operation in heketi_operations: + if heketi_operation["status"] == "failed": + heketi_server_operation_cleanup( + self.heketi_client_node, self.heketi_server_url, + heketi_operation["id"], secret=self.heketi_cli_key, + user=self.heketi_cli_user + ) # verify pvc status is in "Bound" for all the pvc for pvc in self.pvc_list: @@ -204,9 +219,21 @@ class GlusterStabilityTestSetup(GlusterBlockBaseClass): wait_to_heal_complete() + @skip("Blocked by BZ-1634745, BZ-1635736, BZ-1636477") @ddt.data(SERVICE_BLOCKD, SERVICE_TCMU, SERVICE_TARGET) def test_restart_services_provision_volume_and_run_io(self, service): """Restart gluster service then validate volumes""" + skip_msg = ( + "Skipping this test case due to bugs " + "BZ-1634745, BZ-1635736, BZ-1636477, BZ-1641668") + + # TODO(vamahaja): Add check for CRS version + if not self.is_containerized_gluster(): + self.skipTest(skip_msg + " and not implemented CRS version check") + + if get_openshift_storage_version() < "3.11.2": + self.skipTest(skip_msg) + self.deploy_and_verify_resouces() block_hosting_vol = self.get_block_hosting_volume_by_pvc_name( diff --git a/tests/functional/provisioning/test_storage_class_cases.py b/tests/functional/provisioning/test_storage_class_cases.py index 6cf6e96c..2e319f6c 100644 --- a/tests/functional/provisioning/test_storage_class_cases.py +++ b/tests/functional/provisioning/test_storage_class_cases.py @@ -1,5 +1,3 @@ -from unittest import skip - import ddt from glusto.core import Glusto as g @@ -261,7 +259,6 @@ class TestStorageClassCases(BaseClass): ) self.validate_multipath_info(hacount) - @skip("Blocked by BZ-1644685") def test_gluster_block_provisioning_with_invalid_ha_count(self): """Validate gluster-block provisioning with any invalid 'hacount' value @@ -278,12 +275,20 @@ class TestStorageClassCases(BaseClass): "is not supported in OCS 3.9") # get hacount as no of gluster pods + 1 to fail the pvc creation - hacount = get_amount_of_gluster_nodes(self.ocp_master_node[0]) + 1 + gluster_pod_count = get_amount_of_gluster_nodes( + self.ocp_master_node[0]) + hacount = gluster_pod_count + 1 # create storage class and pvc with given parameters self.create_sc_with_parameter( - 'glusterblock', parameter={'hacount': str(hacount)} + 'glusterblock', success=True, parameter={'hacount': str(hacount)} + ) + + # validate HA parameter with gluster block volume + self.validate_gluster_block_volume_info( + self.assertEqual, 'HA', gluster_pod_count ) + self.validate_multipath_info(gluster_pod_count) @ddt.data('true', 'false', '') def test_gluster_block_chapauthenabled_parameter(self, chapauthenabled): -- cgit