Add a new marker to selectively skip health check and conf restore (#6353)

As part of PR #5817, DUT health and config diff check is being ignored by tests that are hardcoded in conftest.py file.

In this PR, a new marker is introduced that will skip the fixture's execution.
Using this approach, the conftest.py file does not need explicit mention of test cases names.

Any testcase can use this marker and skip this fixture without modifcation to conftest.py file.
This would help in limiting to using one marker (vs unique marker for every case to be skipped)
Keep conftest file's logic generic.

Author: vaibhavhd

tests/conftest.py

@@ -1674,7 +1674,7 @@ def check_dut_health_status(duthosts, request):
     if hasattr(request.config.option, 'enable_macsec') and request.config.option.enable_macsec:
         check_flag = False
     for m in request.node.iter_markers():
-        if m.name == "pretest" or m.name == "posttest":
+        if m.name == "skip_check_dut_health":
             check_flag = False
 
     module_name = request.node.name

tests/pytest.ini

@@ -12,6 +12,7 @@ markers:
     topology: specify which topology testcase can be executed on: (t0, t1, ptf, etc)
     platform: specify which platform testcase can be executed on: (physical, virtual, broadcom, mellanox, etc)
     supported_completeness_level: test supported levels of completeness (coverage) level (Debug, Basic, Confident, Thorough)
+    skip_check_dut_health: skip default execution of check_dut_health_status fixture
 
 log_cli_format: %(asctime)s %(funcNamewithModule)-40.40s L%(lineno)-.4d %(levelname)-7s| %(message)s
 log_file_format: %(asctime)s %(funcNamewithModule)-40.40s L%(lineno)-.4d %(levelname)-7s| %(message)s

tests/test_posttest.py

@@ -9,7 +9,8 @@
     pytest.mark.posttest,
     pytest.mark.topology('util'),
     pytest.mark.sanity_check(skip_sanity=True),
-    pytest.mark.disable_loganalyzer
+    pytest.mark.disable_loganalyzer,
+    pytest.mark.skip_check_dut_health
 ]
 
 

tests/test_pretest.py

@@ -22,7 +22,8 @@
 pytestmark = [
     pytest.mark.pretest,
     pytest.mark.topology('util'),
-    pytest.mark.disable_loganalyzer
+    pytest.mark.disable_loganalyzer,
+    pytest.mark.skip_check_dut_health
 ]