From ad777a2c65e9b3d3ff4a536abb333534b2486228 Mon Sep 17 00:00:00 2001 From: vamahaja Date: Thu, 17 Sep 2020 11:33:49 +0530 Subject: [TestFix][Tier4] Add pytest marker for 'tier4' tests Change-Id: I3c331883aff037116d3680649c29a39a266b0684 Signed-off-by: vamahaja --- .../test_gluster_block_stability.py | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'tests/functional/gluster_stability/test_gluster_block_stability.py') diff --git a/tests/functional/gluster_stability/test_gluster_block_stability.py b/tests/functional/gluster_stability/test_gluster_block_stability.py index 1f09fb97..3cf62e48 100644 --- a/tests/functional/gluster_stability/test_gluster_block_stability.py +++ b/tests/functional/gluster_stability/test_gluster_block_stability.py @@ -201,7 +201,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): oc_adm_manage_node, self.node, '--schedulable=true', nodes=g_nodes) - @pytest.mark.tier1 + @pytest.mark.tier4 def test_initiator_side_failures_initiator_and_target_on_different_node( self): @@ -211,7 +211,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): # Perform validation of intiator side failures self.initiator_side_failures() - @pytest.mark.tier1 + @pytest.mark.tier4 def test_initiator_side_failures_initiator_and_target_on_same_node(self): # Note: This test case is supported for containerized gluster only. @@ -236,7 +236,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): self.initiator_side_failures() - @pytest.mark.tier1 + @pytest.mark.tier4 def test_target_side_failures_gluster_blockd_kill_when_ios_going_on(self): """Run I/Os on block volume while gluster-blockd is stoped""" self.create_and_wait_for_pvc() @@ -291,7 +291,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): mpath_dev_new = get_active_and_enabled_devices_from_mpath(node, mpath) self.assertEqual(mpath_dev['active'][0], mpath_dev_new['active'][0]) - @pytest.mark.tier1 + @pytest.mark.tier4 def test_target_side_failures_tcmu_runner_kill_when_ios_going_on(self): """Run I/Os on block volume while tcmu-runner is stoped""" self.create_and_wait_for_pvc() @@ -382,7 +382,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): # Verify that all the paths are up self.verify_all_paths_are_up_in_multipath(mpath, hacount, node) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_initiator_side_failure_restart_pod_when_target_node_is_down(self): """Restart app pod when one gluster node is down""" # Skip test if does not meets requirements @@ -574,7 +574,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): return initiator_nodes[0] - @pytest.mark.tier1 + @pytest.mark.tier4 def test_initiator_and_target_on_same_node_app_pod_deletion(self): """Test iscsi login and logout functionality on deletion of an app pod when initiator and target are on the same node. @@ -597,7 +597,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): # Perform app pod creation and deletion along with block validations self._validate_app_creation_and_deletion_along_block_validations() - @pytest.mark.tier1 + @pytest.mark.tier4 def test_initiator_and_target_on_different_node_app_pod_deletion(self): """Perform block validation during app pod deletion and when initiator and target nodes are different""" @@ -681,7 +681,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): self.verify_iscsi_sessions_and_multipath(pvc, dc_name) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_initiator_and_target_on_diff_node_abrupt_reboot_of_initiator_node( self): """Abrupt reboot initiator node to make sure paths rediscovery is @@ -696,7 +696,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): # Validate iscsi and multipath of app pods after initiator node reboot self._perform_initiator_node_reboot_and_block_validations(ini_node) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_initiator_and_target_on_same_node_abrupt_reboot_of_initiator_node( self): """Abrupt reboot initiator node to make sure paths rediscovery is @@ -779,7 +779,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): "Could not match glusterips in pv describe, difference is %s " % unmatched_tpips) - @pytest.mark.tier1 + @pytest.mark.tier4 @ddt.data('tcmu-runner', 'gluster-blockd') def test_volume_create_delete_when_block_services_are_down(self, service): """Create and Delete PVC's when block related services gluster-blockd, @@ -1037,7 +1037,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): "in out '%s'" % (file_size, _file, out)) self.assertIn(six.text_type(file_size), out, msg) - @pytest.mark.tier1 + @pytest.mark.tier4 def test_tcmu_runner_failure_while_creating_and_deleting_pvc(self): """Kill the tcmu-runner service while creating and deleting PVC's""" @@ -1105,7 +1105,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): 'volume count is 9 ' % volume_count) self.assertEqual(9, volume_count, msg) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_delete_block_volume_with_one_node_down(self): """Validate deletion of block volume when one node is down""" @@ -1146,7 +1146,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): self.heketi_client_node, self.heketi_server_url, block_volume["id"]) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_create_block_pvcs_with_network_failure(self): """Block port 24010 while creating PVC's, run I/O's and verify multipath""" @@ -1181,7 +1181,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): self.verify_iscsi_sessions_and_multipath(pvc_name, dc_with_pod[0]) oc_rsh(self.node, dc_with_pod[1], cmd_run_io % 'file3') - @pytest.mark.tier2 + @pytest.mark.tier4 @ddt.data('active', 'passive', 'all_passive') def test_run_io_and_block_port_on_active_path_network_failure( self, path='active'): @@ -1351,7 +1351,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): self.verify_all_paths_are_up_in_multipath( list(mpaths)[0], hacount, ini_node, timeout=1) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_initiator_failures_reboot_initiator_node_when_target_node_is_down( self): """Restart initiator node when gluster node is down, to make sure paths @@ -1360,7 +1360,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): self._perform_block_validations_when_target_node_is_down( is_reboot_initiator=True) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_block_behaviour_when_target_node_is_down(self): """Test block behaviour of 4 block PVC's accross 2 BHV's when target node is down and make sure paths rediscovery is happening. @@ -1443,7 +1443,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): # Restore targetcli workability loop_for_killing_targetcli_process._proc.terminate() - @pytest.mark.tier2 + @pytest.mark.tier4 @ddt.data(True, False) def test_delete_block_pvcs_with_network_failure(self, is_close_port=True): """Validate heketi pod logs while producing network faliure and @@ -1643,7 +1643,7 @@ class TestGlusterBlockStability(GlusterBlockBaseClass): for blockvol in gluster_vol_info: self.assertNotIn("blockvol_", blockvol) - @pytest.mark.tier2 + @pytest.mark.tier4 def test_create_and_delete_block_pvcs_with_network_failure(self): """Create and delete volumes after blocking the port 24010 on 51% of the nodes""" -- cgit