Use pytest.mark.skip_on_env to have a cleaner code

meaksh · Mar 14, 2024 · 7c33fec · 7c33fec
1 parent 9d1a801
commit 7c33fec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/tests/pytests/integration/daemons/test_memory_leak.py b/tests/pytests/integration/daemons/test_memory_leak.py
@@ -10,8 +10,6 @@
     pytest.mark.timeout_unless_on_windows(360),
 ]
 
-GITHUB_ACTIONS = bool(os.getenv("GITHUB_ACTIONS"))
-
 
 @pytest.fixture
 def file_add_delete_sls(tmp_path, salt_master):

diff --git a/tests/pytests/scenarios/failover/multimaster/test_failover_master.py b/tests/pytests/scenarios/failover/multimaster/test_failover_master.py
@@ -12,10 +12,8 @@
 
 log = logging.getLogger(__name__)
 
-GITHUB_ACTIONS = bool(os.getenv("GITHUB_ACTIONS"))
 
-
-@pytest.mark.skipif(GITHUB_ACTIONS, reason="Test is failing in GitHub Actions")
+@pytest.mark.skip_on_env("GITHUB_ACTIONS", present=True)
 def test_pki(salt_mm_failover_master_1, salt_mm_failover_master_2, caplog):
     """
     Verify https://docs.saltproject.io/en/latest/topics/tutorials/multimaster_pki.html