Simplify and fix test_importlib_resources

Signed-off-by: Cristian Le <[email protected]>

Author: LecrisUT

tests/test_editable.py

@@ -1,3 +1,4 @@
+import platform
 import sys
 import textwrap
 from pathlib import Path
@@ -206,6 +207,10 @@ def _setup_package_for_editable_layout_tests(
     ("editable", "editable_mode"), [(False, ""), (True, "redirect"), (True, "inplace")]
 )
 def test_direct_import(monkeypatch, tmp_path, editable, editable_mode, isolated):
+    # TODO: Investigate these failures
+    if platform.system() == "Windows" and editable_mode == "inplace":
+        pytest.xfail("Windows fails to import the top-level extension module")
+
     _setup_package_for_editable_layout_tests(  # type: ignore[no-untyped-call]
         monkeypatch, tmp_path, editable, editable_mode, isolated
     )
@@ -218,114 +223,62 @@ def test_direct_import(monkeypatch, tmp_path, editable, editable_mode, isolated)
 @pytest.mark.configure
 @pytest.mark.integration
 @pytest.mark.parametrize(
-    ("editable", "editable_mode", "check"),
+    ("editable", "editable_mode"),
     [
-        # Without editable
-        (False, "", "isinstance(files(pkg), pathlib.Path)"),
-        (False, "", "any(str(x).endswith('.so') for x in files(pkg).iterdir())"),
-        (False, "", "isinstance(files(pkg.sub_a), pathlib.Path)"),
-        (
-            False,
-            "",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_a).iterdir())",
-        ),
-        (False, "", "isinstance(files(pkg.sub_b), pathlib.Path)"),
-        (
-            False,
-            "",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b).iterdir())",
-        ),
-        (False, "", "isinstance(files(pkg.sub_b.sub_c), pathlib.Path)"),
-        (
-            False,
-            "",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_c).iterdir())",
-        ),
-        (False, "", "isinstance(files(pkg.sub_b.sub_d), pathlib.Path)"),
-        (
-            False,
-            "",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_d).iterdir())",
-        ),
-        # Editable redirect
-        (True, "redirect", "isinstance(files(pkg), pathlib.Path)"),
-        pytest.param(
-            True,
-            "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg).iterdir())",
-            marks=pytest.mark.xfail,
-        ),
-        (True, "redirect", "isinstance(files(pkg.sub_a), pathlib.Path)"),
-        pytest.param(
-            True,
-            "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_a).iterdir())",
-            marks=pytest.mark.xfail,
-        ),
-        (True, "redirect", "isinstance(files(pkg.sub_b), pathlib.Path)"),
-        pytest.param(
-            True,
-            "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b).iterdir())",
-            marks=pytest.mark.xfail,
-        ),
-        (True, "redirect", "isinstance(files(pkg.sub_b.sub_c), pathlib.Path)"),
+        (False, ""),
         pytest.param(
             True,
             "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_c).iterdir())",
             marks=pytest.mark.xfail,
         ),
-        (True, "redirect", "isinstance(files(pkg.sub_b.sub_d), pathlib.Path)"),
-        pytest.param(
-            True,
-            "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_d).iterdir())",
-            marks=pytest.mark.xfail,
-        ),
-        # Editable inplace
-        (True, "inplace", "isinstance(files(pkg), pathlib.Path)"),
-        (True, "inplace", "any(str(x).endswith('.so') for x in files(pkg).iterdir())"),
-        (True, "inplace", "isinstance(files(pkg.sub_a), pathlib.Path)"),
-        (
-            True,
-            "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_a).iterdir())",
-        ),
-        (True, "inplace", "isinstance(files(pkg.sub_b), pathlib.Path)"),
-        (
-            True,
-            "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b).iterdir())",
-        ),
-        (True, "inplace", "isinstance(files(pkg.sub_b.sub_c), pathlib.Path)"),
-        (
-            True,
-            "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_c).iterdir())",
-        ),
-        (True, "inplace", "isinstance(files(pkg.sub_b.sub_d), pathlib.Path)"),
-        (
-            True,
-            "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_d).iterdir())",
-        ),
+        (True, "inplace"),
     ],
 )
-def test_importlib_resources(
-    monkeypatch, tmp_path, editable, editable_mode, isolated, check
-):
-    _setup_package_for_editable_layout_tests(  # type: ignore[no-untyped-call]
+def test_importlib_resources(monkeypatch, tmp_path, editable, editable_mode, isolated):
+    if sys.version_info < (3, 9):
+        pytest.skip("importlib.resources.files is introduced in Python 3.9")
+
+    # TODO: Investigate these failures
+    if editable_mode == "redirect":
+        pytest.xfail("Redirect mode is at navigating importlib.resources.files")
+    if platform.system() == "Windows" and editable_mode == "inplace":
+        pytest.xfail("Windows fails to import the top-level extension module")
+
+    _setup_package_for_editable_layout_tests(
         monkeypatch, tmp_path, editable, editable_mode, isolated
     )
+
     isolated.execute(
         textwrap.dedent(
-            f"""
+            """
+            from importlib import import_module
             from importlib.resources import files
-            from importlib.readers import MultiplexedPath
-            import pkg
-            import pathlib
-            assert {check}
+            from pathlib import Path
+            
+            def is_extension(path):
+                for ext in (".so", ".pyd"):
+                    if ext in path.suffixes:
+                        return True
+                return False
+            
+            def check_pkg(pkg_name):
+                try:
+                    pkg = import_module(pkg_name)
+                    pkg_root = files(pkg)
+                    print(f"pkg_root: [{type(pkg_root)}] {pkg_root}")
+                    pkg_files = list(pkg_root.iterdir())
+                    for path in pkg_files:
+                        print(f"path: [{type(path)}] {path}")
+                    assert any(is_extension(path) for path in pkg_files if isinstance(path, Path))
+                except Exception as err:
+                    msg = f"Failed in {str(pkg)}"
+                    raise RuntimeError(msg) from err
+            
+            check_pkg("pkg")
+            check_pkg("pkg.sub_a")
+            check_pkg("pkg.sub_b")
+            check_pkg("pkg.sub_b.sub_c")
+            check_pkg("pkg.sub_b.sub_d")
             """
         )
     )