Update test_importlib_resources

Author: vyasr

tests/test_editable.py

@@ -221,29 +221,29 @@ def test_direct_import(monkeypatch, tmp_path, editable, editable_mode, isolated)
         # Without editable
         (False, "", "isinstance(files(pkg), pathlib.Path)"),
         (False, "", "any(str(x).endswith('.so') for x in files(pkg).iterdir())"),
-        (False, "", "isinstance(files(pkg.subpkg1), pathlib.Path)"),
+        (False, "", "isinstance(files(pkg.sub_a), pathlib.Path)"),
         (
             False,
             "",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg1).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_a).iterdir())",
         ),
-        (False, "", "isinstance(files(pkg.subpkg2), pathlib.Path)"),
+        (False, "", "isinstance(files(pkg.sub_b), pathlib.Path)"),
         (
             False,
             "",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b).iterdir())",
         ),
-        (False, "", "isinstance(files(pkg.subpkg2.subsubpkg1), pathlib.Path)"),
+        (False, "", "isinstance(files(pkg.sub_b.sub_c), pathlib.Path)"),
         (
             False,
             "",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2.subsubpkg1).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_c).iterdir())",
         ),
-        (False, "", "isinstance(files(pkg.subpkg2.subsubpkg2), pathlib.Path)"),
+        (False, "", "isinstance(files(pkg.sub_b.sub_d), pathlib.Path)"),
         (
             False,
             "",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2.subsubpkg2).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_d).iterdir())",
         ),
         # Editable redirect
         (True, "redirect", "isinstance(files(pkg), pathlib.Path)"),
@@ -253,60 +253,60 @@ def test_direct_import(monkeypatch, tmp_path, editable, editable_mode, isolated)
             "any(str(x).endswith('.so') for x in files(pkg).iterdir())",
             marks=pytest.mark.xfail,
         ),
-        (True, "redirect", "isinstance(files(pkg.subpkg1), pathlib.Path)"),
+        (True, "redirect", "isinstance(files(pkg.sub_a), pathlib.Path)"),
         pytest.param(
             True,
             "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg1).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_a).iterdir())",
             marks=pytest.mark.xfail,
         ),
-        (True, "redirect", "isinstance(files(pkg.subpkg2), pathlib.Path)"),
+        (True, "redirect", "isinstance(files(pkg.sub_b), pathlib.Path)"),
         pytest.param(
             True,
             "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b).iterdir())",
             marks=pytest.mark.xfail,
         ),
-        (True, "redirect", "isinstance(files(pkg.subpkg2.subsubpkg1), pathlib.Path)"),
+        (True, "redirect", "isinstance(files(pkg.sub_b.sub_c), pathlib.Path)"),
         pytest.param(
             True,
             "redirect",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2.subsubpkg1).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_c).iterdir())",
             marks=pytest.mark.xfail,
         ),
-        (True, "redirect", "isinstance(files(pkg.subpkg2.subsubpkg2), pathlib.Path)"),
+        (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.subpkg2.subsubpkg2).iterdir())",
+            "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.subpkg1), pathlib.Path)"),
+        (True, "inplace", "isinstance(files(pkg.sub_a), pathlib.Path)"),
         (
             True,
             "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg1).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_a).iterdir())",
         ),
-        (True, "inplace", "isinstance(files(pkg.subpkg2), pathlib.Path)"),
+        (True, "inplace", "isinstance(files(pkg.sub_b), pathlib.Path)"),
         (
             True,
             "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b).iterdir())",
         ),
-        (True, "inplace", "isinstance(files(pkg.subpkg2.subsubpkg1), pathlib.Path)"),
+        (True, "inplace", "isinstance(files(pkg.sub_b.sub_c), pathlib.Path)"),
         (
             True,
             "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2.subsubpkg1).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_c).iterdir())",
         ),
-        (True, "inplace", "isinstance(files(pkg.subpkg2.subsubpkg2), pathlib.Path)"),
+        (True, "inplace", "isinstance(files(pkg.sub_b.sub_d), pathlib.Path)"),
         (
             True,
             "inplace",
-            "any(str(x).endswith('.so') for x in files(pkg.subpkg2.subsubpkg2).iterdir())",
+            "any(str(x).endswith('.so') for x in files(pkg.sub_b.sub_d).iterdir())",
         ),
     ],
 )