Skip tests of legacy features in NFI mode

Author: fangerer

graalpython/lib-graalpython/modules/hpy/test/conftest.py

@@ -46,3 +46,9 @@ def compiler(request, tmpdir, hpy_devel, hpy_abi):
     compiler_verbose = request.config.getoption('--compiler-v')
     return ExtensionCompiler(tmpdir, hpy_devel, hpy_abi,
                              compiler_verbose=compiler_verbose)
+
+@pytest.fixture()
+def skip_nfi(self, hpy_abi):
+    # skip all tests in this class for NFI mode
+    if hpy_abi == 'nfi':
+        pytest.skip()

graalpython/lib-graalpython/modules/hpy/test/test_cpy_compat.py

@@ -37,12 +37,6 @@ class TestCPythonCompatibility(HPyTest):
     # really make sens on PyPy. We still run the functions to ensure they do
     # not crash, though.
 
-    @pytest.fixture()
-    def skip_nfi(self, hpy_abi):
-        # skip all tests in this class for NFI mode
-        if hpy_abi == 'nfi':
-            pytest.skip()
-
     def test_frompyobject(self):
         mod = self.make_module("""
             #include <Python.h>

graalpython/lib-graalpython/modules/hpy/test/test_hpytype_legacy.py

@@ -27,6 +27,7 @@
 from .test_hpytype import PointTemplate, TestType as _TestType
 
 
+@pytest.mark.usefixtures('skip_nfi')
 class LegacyPointTemplate(PointTemplate):
     """
     Override PointTemplate to instead define a legacy point type that
@@ -47,11 +48,13 @@ class LegacyPointTemplate(PointTemplate):
     _IS_LEGACY = ".legacy = true,"
 
 
+@pytest.mark.usefixtures('skip_nfi')
 class TestLegacyType(_TestType):
 
     ExtensionTemplate = LegacyPointTemplate
 
 
+@pytest.mark.usefixtures('skip_nfi')
 class TestCustomLegacyFeatures(HPyTest):
 
     def test_legacy_methods(self):

graalpython/lib-graalpython/modules/hpy/test/test_slots_legacy.py

@@ -28,16 +28,19 @@
 from .test_slots import TestSlots as _TestSlots, TestSqSlots as _TestSqSlots
 
 
+@pytest.mark.usefixtures('skip_nfi')
 class TestLegacySlots(_TestSlots):
 
     ExtensionTemplate = LegacyPointTemplate
 
 
+@pytest.mark.usefixtures('skip_nfi')
 class TestLegacySqSlots(_TestSqSlots):
 
     ExtensionTemplate = LegacyPointTemplate
 
 
+@pytest.mark.usefixtures('skip_nfi')
 class TestCustomLegacySlotsFeatures(HPyTest):
 
     def test_legacy_slots(self):