Fix xp_extension() mark collection, apply to test_signature.py

Author: honno

conftest.py renamed to array_api_tests/conftest.py

@@ -1,6 +1,11 @@
+from functools import lru_cache
+
 from hypothesis import settings
 from pytest import mark
 
+from . import _array_module as xp
+from ._array_module import _UndefinedStub
+
 
 settings.register_profile('xp_default', deadline=800)
 
@@ -9,10 +14,10 @@ def pytest_addoption(parser):
     # Enable extensions
     parser.addoption(
         '--ext',
-        '--extensions',
+        '--disable-extensions',
         nargs='+',
         default=[],
-        help='enable testing for Array API extensions',
+        help='disable testing for Array API extensions',
     )
     # Hypothesis max examples
     # See https://github.com/HypothesisWorks/hypothesis/issues/2434
@@ -51,10 +56,22 @@ def pytest_configure(config):
         settings.load_profile('xp_default')
 
 
+@lru_cache
+def xp_has_ext(ext: str) -> bool:
+    try:
+        return not isinstance(getattr(xp, ext), _UndefinedStub)
+    except AttributeError:
+        return False
+
+
 def pytest_collection_modifyitems(config, items):
-    exts = config.getoption('--extensions')
+    disabled_exts = config.getoption('--disable-extensions')
     for item in items:
         if 'xp_extension' in item.keywords:
             ext = item.keywords['xp_extension'].args[0]
-            if ext not in exts:
-                item.add_marker(mark.skip(reason=f'{ext} not enabled in --extensions'))
+            if ext in disabled_exts:
+                item.add_marker(
+                    mark.skip(reason=f'{ext} disabled in --disable-extensions')
+                )
+            elif not xp_has_ext(ext):
+                item.add_marker(mark.skip(reason=f'{ext} not found in array module'))

array_api_tests/meta_tests/test_utils.py

@@ -0,0 +1,14 @@
+from ..test_signatures import extension_module
+from ..conftest import xp_has_ext
+
+
+def test_extension_module_is_extension():
+    assert extension_module('linalg')
+
+
+def test_extension_func_is_not_extension():
+    assert not extension_module('linalg.cross')
+
+
+def test_xp_has_ext():
+    assert not xp_has_ext('nonexistent_extension')

array_api_tests/test_signatures.py

@@ -26,7 +26,18 @@ def extension_module(name):
     if extension_module(n):
         extension_module_names.extend([f'{n}.{i}' for i in getattr(function_stubs, n).__all__])
 
-all_names = function_stubs.__all__ + extension_module_names
+
+params = []
+for name in function_stubs.__all__:
+    marks = []
+    if extension_module(name):
+        marks.append(pytest.mark.xp_extension(name))
+    params.append(pytest.param(name, marks=marks))
+for name in extension_module_names:
+    ext = name.split('.')[0]
+    mark = pytest.mark.xp_extension(ext)
+    params.append(pytest.param(name, marks=[mark]))
+
 
 def array_method(name):
     return stub_module(name) == 'array_object'
@@ -130,7 +141,7 @@ def example_argument(arg, func_name, dtype):
     else:
         raise RuntimeError(f"Don't know how to test argument {arg}. Please update test_signatures.py")
 
-@pytest.mark.parametrize('name', all_names)
+@pytest.mark.parametrize('name', params)
 def test_has_names(name):
     if extension_module(name):
         assert hasattr(mod, name), f'{mod_name} is missing the {name} extension'
@@ -146,7 +157,7 @@ def test_has_names(name):
     else:
         assert hasattr(mod, name), f"{mod_name} is missing the {function_category(name)} function {name}()"
 
-@pytest.mark.parametrize('name', all_names)
+@pytest.mark.parametrize('name', params)
 def test_function_positional_args(name):
     # Note: We can't actually test that positional arguments are
     # positional-only, as that would require knowing the argument name and
@@ -223,7 +234,7 @@ def test_function_positional_args(name):
             # NumPy ufuncs raise ValueError instead of TypeError
             raises((TypeError, ValueError), lambda: mod_func(*args[:n]), f"{name}() should not accept {n} positional arguments")
 
-@pytest.mark.parametrize('name', all_names)
+@pytest.mark.parametrize('name', params)
 def test_function_keyword_only_args(name):
     if extension_module(name):
         return