tests: Fixes for Windows.

conftest.py: Use os.replace() instead of os.rename() to work on Windows.
test_fs.py: Remove leading / on lfs filenames.
Move mock data sets back into tests/data/
Change the layout of the mock-fs folder.

Author: glenn20

tests/conftest.py

@@ -12,13 +12,16 @@
 from pathlib import Path
 from typing import Any
 
-import mp_image_tool_esp32
 import pytest
+import requests
 from _pytest.config import Config
+
+import mp_image_tool_esp32
 from mp_image_tool_esp32 import data_table
 
 rootdir: Path = Path(__file__).parent.parent  # The root directory of the project
-datadir: Path = Path(__file__).parent / "data"  # Location for firmware files
+testsdir: Path = Path(__file__).parent  # Location for test files
+datadir: Path = testsdir / "data"  # Location for firmware files
 
 mpi_prog: Path = rootdir / "mp-image-tool-esp32"  # Location of the tool to test
 
@@ -45,9 +48,9 @@
 firmware_baseurl = "https://micropython.org/resources/firmware/"
 firmware_files = [
     f"ESP32_GENERIC-{firmware_version}.bin",
-    f"ESP32_GENERIC_S2-{firmware_version}.bin",
-    f"ESP32_GENERIC_S3-FLASH_4M-{firmware_version}.bin",
-    f"ESP32_GENERIC_C3-{firmware_version}.bin",
+    # f"ESP32_GENERIC_S2-{firmware_version}.bin",
+    # f"ESP32_GENERIC_S3-FLASH_4M-{firmware_version}.bin",
+    # f"ESP32_GENERIC_C3-{firmware_version}.bin",
 ]
 firmware_file: Path = datadir / firmware_files[0]
 mpi_last_output: str = ""
@@ -110,10 +113,10 @@ def download_firmware_files():
     for f in firmware_files:
         if not (datadir / f).exists():
             print(f"Downloading firmware file: {f}")
-            subprocess.run(
-                ["wget", f"{firmware_baseurl}{f}", "-O", f"{datadir / f}"],
-                check=True,
-            )
+            r: requests.Response = requests.get(f"{firmware_baseurl}{f}")
+            if r.status_code == 200:
+                with open(datadir / f, "wb") as fw:
+                    fw.write(r.content)
 
 
 ## pytest_configure is called after command line options have been parsed
@@ -158,7 +161,7 @@ def do_mpi_run(firmware: Path, *args: str, output: Path | None = None) -> None:
     # subprocess.run(cmd)
     if not output and outputfile.exists() and firmware.parent == Path("."):
         # Replace the firmware file with the output file
-        os.rename(outputfile, firmware)
+        os.replace(outputfile, firmware)
 
 
 def mpi_run(firmware: Path, *args: str, output: Path | None = None) -> str:
@@ -304,7 +307,7 @@ def firmware(device: Path | None, firmwarefile: Path) -> Path:
 def bootloader(firmwarefile: Path) -> bytes:
     """A fixture to extract the bootloader from a firmware file.
     The bootloader image is returned as a bytes object."""
-    return firmwarefile.read_bytes()[:BOOTLOADER_SIZE].rstrip(b"\xFF")
+    return firmwarefile.read_bytes()[:BOOTLOADER_SIZE].rstrip(b"\xff")
 
 
 @pytest.fixture()
@@ -319,4 +322,4 @@ def app_image(firmwarefile: Path) -> bytes:
     offset = FACTORY_OFFSET  # Start of app image within firmware file
     if chip_name in ("esp32", "esp32s2"):
         offset -= 0x1000  # ESP32 and ESP32S2 firmwares start at offset 0x1000
-    return firmwarefile.read_bytes()[offset:].rstrip(b"\xFF")
+    return firmwarefile.read_bytes()[offset:].rstrip(b"\xff")

tests/data/ESP32_GENERIC-20240602-v1.23.0.bin

@@ -0,0 +1,5 @@
+# This file is executed on every boot (including wake-boot from deepsleep)
+#import esp
+#esp.osdebug(None)
+#import webrepl
+#webrepl.start()

tests/data/mock-fs/boot.py

@@ -46,11 +46,11 @@ def test_mkdir(mock_device: Path) -> None:
 
 
 def test_rm_file(mock_device: Path) -> None:
-    mpi_check_ls(mock_device, "-q --fs rm lib/ota/blockdev_writer.mpy")
+    mpi_check_ls(mock_device, "-q --fs rm ota/blockdev_writer.mpy")
 
 
 def test_rm_directory(mock_device: Path) -> None:
-    mpi_check_ls(mock_device, "-q --fs rm /lib")
+    mpi_check_ls(mock_device, "-q --fs rm ota")
 
 
 def test_mkfs(mock_device: Path) -> None:
@@ -70,7 +70,7 @@ def test_grow(mock_device: Path) -> None:
 
 def test_get(mock_device: Path) -> None:
     """Download a file and compare to the original."""
-    mpi_run(mock_device, "-q --fs get /boot.py")
+    mpi_run(mock_device, "-q --fs get boot.py")
     assert Path("boot.py").exists()
     assert Path("boot.py").read_text() == (mockfs_dir / "boot.py").read_text()
 
@@ -82,7 +82,7 @@ def test_put(mock_device: Path) -> None:
     input.write_bytes(data)
     assert input.stat().st_size == 256 * 16
     mpi_run(mock_device, f"-q --fs put {input}")
-    mpi_run(mock_device, f"-q --fs get /{input} {output}")
+    mpi_run(mock_device, f"-q --fs get {input} {output}")
     assert output.exists()
     assert output.read_bytes() == input.read_bytes()
 
@@ -92,10 +92,16 @@ def test_get_directory(mock_device: Path) -> None:
     original."""
     rootfs = Path("rootfs")
     assert not rootfs.exists()
-    mpi_run(mock_device, "-q --fs get / rootfs")
+    try:
+        mpi_run(mock_device, "-q --fs get . rootfs")
+    except Exception as e:
+        for f in rootfs.rglob("*"):
+            print(f, f.is_file(), f.stat())
+        raise e
     assert rootfs.is_dir()
     new_files = list(rootfs.rglob("*"))
     orig_files = list(mockfs_dir.rglob("*"))
+    assert len(orig_files) > 3  # We expect 6 files in the mockfs
     assert len(new_files) == len(orig_files)
     for new, orig in zip(new_files, orig_files):
         assert new.relative_to(rootfs) == orig.relative_to(mockfs_dir)
@@ -111,10 +117,11 @@ def test_put_directory(mock_device: Path) -> None:
     """Upload the entire filesystem to a directory and compare to the
     original."""
     rootfs = Path("rootfs")
-    assert not rootfs.exists()
-    mpi_run(mock_device, "-q --fs mkdir /rootfs")
-    mpi_run(mock_device, f"-q --fs put {mockfs_dir} /rootfs")
-    mpi_run(mock_device, f"-q --fs get /rootfs {rootfs}")
+    if rootfs.exists():
+        shutil.rmtree(rootfs)
+    mpi_run(mock_device, "-q --fs mkdir rootfs")
+    mpi_run(mock_device, f"-q --fs put '{mockfs_dir.as_posix()}' rootfs")
+    mpi_run(mock_device, f"-q --fs get rootfs {rootfs}")
     assert rootfs.is_dir()
     new_dir = rootfs / mockfs_dir.name
     new_files = list(new_dir.rglob("*"))

tests/data/mock-fs/ota/blockdev_writer.mpy

@@ -81,12 +81,11 @@
 
 -q --fs ls: |
   boot.py
-  lib/
-  lib/ota/
-  lib/ota/blockdev_writer.mpy
-  lib/ota/rollback.mpy
-  lib/ota/status.mpy
-  lib/ota/update.mpy
+  ota/
+  ota/blockdev_writer.mpy
+  ota/rollback.mpy
+  ota/status.mpy
+  ota/update.mpy
 
 -q --fs cat boot.py: |
   # This file is executed on every boot (including wake-boot from deepsleep)
@@ -97,41 +96,38 @@
 
 -q --fs rename boot.py boot.bak: |
   boot.bak
-  lib/
-  lib/ota/
-  lib/ota/blockdev_writer.mpy
-  lib/ota/rollback.mpy
-  lib/ota/status.mpy
-  lib/ota/update.mpy
+  ota/
+  ota/blockdev_writer.mpy
+  ota/rollback.mpy
+  ota/status.mpy
+  ota/update.mpy
 
 -q --fs mkdir data: |
   boot.py
   data/
-  lib/
-  lib/ota/
-  lib/ota/blockdev_writer.mpy
-  lib/ota/rollback.mpy
-  lib/ota/status.mpy
-  lib/ota/update.mpy
-
--q --fs rm lib/ota/blockdev_writer.mpy: |
+  ota/
+  ota/blockdev_writer.mpy
+  ota/rollback.mpy
+  ota/status.mpy
+  ota/update.mpy
+
+-q --fs rm ota/blockdev_writer.mpy: |
   boot.py
-  lib/
-  lib/ota/
-  lib/ota/rollback.mpy
-  lib/ota/status.mpy
-  lib/ota/update.mpy
+  ota/
+  ota/rollback.mpy
+  ota/status.mpy
+  ota/update.mpy
 
--q --fs rm /lib: |
+-q --fs rm ota: |
   boot.py
 
 -q --fs mkfs vfs: |
   boot.py
 
 -q --fs df vfs: |
   # Partition       Total kB  Used kB   Free kB  Used%
-    vfs                 2048       36      2012     2%
+    vfs                 2048       28      2020     1%
 
 -q -f 6M --resize vfs=0 --fs grow --fs df: |
   # Partition       Total kB  Used kB   Free kB  Used%
-    vfs                 4096       36      4060     1%
+    vfs                 4096       28      4068     1%