Merge pull request #10735 from vavuthu/fix_ordering_for_tc

fix ordering of testcases

tests/cross_functional/kcs/test_monitor_recovery.py

@@ -53,7 +53,7 @@
 @magenta_squad
 @system_test
 @ignore_leftovers
-@pytest.mark.last
+@pytest.mark.order("last")
 @pytest.mark.polarion_id("OCS-3911")
 @pytest.mark.bugzilla("1973256")
 @skipif_ocs_version("<4.6")

tests/cross_functional/system_test/multicluster/test_ms_markers.py

@@ -72,7 +72,7 @@ def test_marker_skipif_ms_provider(self):
         )
 
     @runs_on_provider
-    @pytest.mark.second_to_last
+    @pytest.mark.order("second_to_last")
     def test_runs_on_provider_marker(self):
         """
         Test that the 'runs_on_provider' marker work as expected
@@ -82,7 +82,7 @@ def test_runs_on_provider_marker(self):
         ), "The cluster is not a provider cluster, even though we have the marker 'runs_on_provider'"
         logger.info("The cluster is a provider cluster as expected")
 
-    @pytest.mark.last
+    @pytest.mark.order("last")
     def test_current_index_not_change_after_using_runs_on_provider(self):
         """
         Test that the current cluster index didn't change after using the 'runs_on_provider'

tests/functional/disaster-recovery/sc_arbiter/test_add_capacity.py

@@ -66,7 +66,7 @@ def add_capacity_to_stretch_cluster():
         ), "OSD weights are not balanced"
         logger.info("OSD weights are balanced")
 
-    @pytest.mark.last
+    @pytest.mark.order("last")
     @pytest.mark.parametrize(
         argnames=["iterations"],
         argvalues=[

tests/functional/z_cluster/cluster_expansion/test_add_capacity.py

@@ -118,7 +118,7 @@ def add_capacity_test(ui_flag=False):
 
 @ignore_leftovers
 @polarion_id("OCS-1191")
-@pytest.mark.second_to_last
+@pytest.mark.order("second_to_last")
 @skipif_managed_service
 @skipif_aws_i3
 @skipif_bm
@@ -152,7 +152,7 @@ def test_add_capacity_ui(self, reduce_and_resume_cluster_load):
 
 @ignore_leftovers
 @polarion_id("OCS-4647")
-@pytest.mark.second_to_last
+@pytest.mark.order("second_to_last")
 @skipif_aws_i3
 @skipif_bm
 @skipif_bmpsi

tests/functional/z_cluster/cluster_expansion/test_resize_osd.py

@@ -274,7 +274,7 @@ def test_resize_osd_when_capacity_near_full(
         self.verification_steps_post_resize_osd()
 
     @tier4a
-    @pytest.mark.second
+    @pytest.mark.order("second")
     @ibmcloud_platform_required
     @pytest.mark.parametrize(
         argnames=["size_to_increase"],
@@ -306,7 +306,7 @@ def test_resize_osd_for_large_diff(self, size_to_increase):
     @tier4b
     @tier4c
     @black_squad
-    @pytest.mark.last
+    @pytest.mark.order("last")
     @polarion_id("OCS-5800")
     def test_ui_storage_size_post_resize_osd(self, setup_ui_session):
         """

tests/libtest/test_hci_pc_markers.py

@@ -72,7 +72,7 @@ def test_marker_skipif_hci_provider(self):
         )
 
     @runs_on_provider
-    @pytest.mark.second_to_last
+    @pytest.mark.order("second_to_last")
     def test_runs_on_provider_marker(self):
         """
         Test that the 'runs_on_provider' marker work as expected
@@ -82,7 +82,7 @@ def test_runs_on_provider_marker(self):
         ), "The cluster is not a HCI provider cluster, even though we have the marker 'runs_on_provider'"
         logger.info("The cluster is a provider cluster as expected")
 
-    @pytest.mark.last
+    @pytest.mark.order("last")
     def test_current_index_not_change_after_using_runs_on_provider(self):
         """
         Test that the current cluster index didn't change after using the 'runs_on_provider'