Switch to a micropython test

Author: tannewt

ports/zephyr-cp/tests/conftest.py

@@ -289,22 +289,12 @@ def circuitpython(request, board, sim_id, native_sim_binary, native_sim_env, tmp
             tmp_drive = tmp_path / f"drive{i}"
             tmp_drive.mkdir(exist_ok=True)
 
-            created_dirs: set[str] = set()
             for name, content in files.items():
                 src = tmp_drive / name
-                src.parent.mkdir(parents=True, exist_ok=True)
                 if isinstance(content, bytes):
                     src.write_bytes(content)
                 else:
                     src.write_text(content)
-                parent = Path(name).parent
-                if parent != Path("."):
-                    parts = parent.parts
-                    for depth in range(1, len(parts) + 1):
-                        sub = "/".join(parts[:depth])
-                        if sub not in created_dirs:
-                            subprocess.run(["mmd", "-i", str(flash), f"::{sub}"], check=True)
-                            created_dirs.add(sub)
                 subprocess.run(["mcopy", "-i", str(flash), str(src), f"::{name}"], check=True)
 
         trace_file = tmp_path / f"trace-{i}.perfetto"

ports/zephyr-cp/tests/test_basics.py

@@ -92,28 +92,6 @@ def test_ctrl_c_interrupt(circuitpython):
     assert "completed" not in output
 
 
-IMPORT_PRECEDENCE_CODE = """\
-import fake_lib
-print("done")
-"""
-
-
-@pytest.mark.circuitpy_drive(
-    {
-        "code.py": IMPORT_PRECEDENCE_CODE,
-        "fake_lib/a_spritesheet.bmp": b"",
-        "fake_lib.py": 'print("hello fake_lib.py")\n',
-    }
-)
-def test_py_file_wins_over_namespace_dir(circuitpython):
-    """#10614: a .py module beats a sibling directory lacking __init__.py."""
-    circuitpython.wait_until_done()
-
-    output = circuitpython.serial.all_output
-    assert "hello fake_lib.py" in output
-    assert "done" in output
-
-
 RELOAD_CODE = """\
 print("first run")
 import time

tests/import/import_shared_name.py

@@ -0,0 +1,7 @@
+# https://github.com/adafruit/circuitpython/issues/10614
+# When a directory `shared_name/` (no __init__.py) and a module `shared_name.py`
+# share a name, `import shared_name` must pick the .py module per PEP 420
+# precedence: regular package > module > namespace package.
+import shared_name
+
+print("done")

tests/import/shared_name.py

@@ -0,0 +1 @@
+print("hello shared_name.py")