move pytest marks to python.lib (#1323)

Author: astrophysik

tests/python/lib/conftest_impl.py

@@ -0,0 +1,39 @@
+import os
+import pytest
+
+from .file_utils import search_k2_bin
+
+
+@pytest.fixture(autouse=True)
+def skip_k2_unsupported_test(request):
+    if search_k2_bin() is not None:
+        k2_skip_mark = request.node.get_closest_marker("k2_skip")
+        if k2_skip_mark:
+            pytest.skip("K2 skipped test")
+
+
+@pytest.fixture(scope="class", autouse=True)
+def skip_k2_unsupported_test_suite(request):
+    if search_k2_bin() is not None:
+        k2_skip_mark = request.node.get_closest_marker("k2_skip_suite")
+        if k2_skip_mark:
+            request.cls.custom_setup = lambda: None
+            request.cls.custom_teardown = lambda: None
+            pytest.skip("K2 skipped test")
+
+@pytest.fixture(autouse=True)
+def skip_kphp_unsupported_test(request):
+    if search_k2_bin() is None:
+        kphp_skip_mark = request.node.get_closest_marker("kphp_skip")
+        if kphp_skip_mark:
+            pytest.skip("KPHP skipped test")
+
+
+@pytest.fixture(scope="class", autouse=True)
+def skip_kphp_unsupported_test_suite(request):
+    if search_k2_bin() is None:
+        kphp_skip_mark = request.node.get_closest_marker("kphp_skip_suite")
+        if kphp_skip_mark:
+            request.cls.custom_setup = lambda: None
+            request.cls.custom_teardown = lambda: None
+            pytest.skip("KPHP skipped test")

tests/python/tests/conftest.py

@@ -1,39 +1,4 @@
 import os
 import pytest
 
-from python.lib.file_utils import search_k2_bin
-
-
-@pytest.fixture(autouse=True)
-def skip_k2_unsupported_test(request):
-    if search_k2_bin() is not None:
-        k2_skip_mark = request.node.get_closest_marker("k2_skip")
-        if k2_skip_mark:
-            pytest.skip("K2 skipped test")
-
-
-@pytest.fixture(scope="class", autouse=True)
-def skip_k2_unsupported_test_suite(request):
-    if search_k2_bin() is not None:
-        k2_skip_mark = request.node.get_closest_marker("k2_skip_suite")
-        if k2_skip_mark:
-            request.cls.custom_setup = lambda: None
-            request.cls.custom_teardown = lambda: None
-            pytest.skip("K2 skipped test")
-
-@pytest.fixture(autouse=True)
-def skip_kphp_unsupported_test(request):
-    if search_k2_bin() is None:
-        kphp_skip_mark = request.node.get_closest_marker("kphp_skip")
-        if kphp_skip_mark:
-            pytest.skip("KPHP skipped test")
-
-
-@pytest.fixture(scope="class", autouse=True)
-def skip_kphp_unsupported_test_suite(request):
-    if search_k2_bin() is None:
-        kphp_skip_mark = request.node.get_closest_marker("kphp_skip_suite")
-        if kphp_skip_mark:
-            request.cls.custom_setup = lambda: None
-            request.cls.custom_teardown = lambda: None
-            pytest.skip("KPHP skipped test")
+from python.lib.conftest_impl import skip_k2_unsupported_test, skip_k2_unsupported_test_suite

tests/python/tests/pytest.ini

@@ -1,4 +1,6 @@
 [pytest]
 markers =
     k2_skip: mark a test as k2 skip
-    k2_skip_suite: mark test suite as k2 skip
+    k2_skip_suite: mark test suite as k2 skip
+    kphp_skip: mark a test as kphp skip
+    kphp_skip_suite: mark test suite as kphp skip