hmmm

Author: allisonkarlitskaya

examples/bls/extra/root/.ssh/authorized_keys

@@ -1,5 +1,5 @@
 [tool.pytest.ini_options]
-addopts = "-sv"
+addopts = "--strict-markers -v"
 asyncio_mode = "auto"
+pythonpath = "."
 testpaths = ["test"]
-pythonpath = '.'

examples/pyproject.toml

@@ -2,27 +2,19 @@
 
 import os
 from collections.abc import AsyncGenerator
-from pathlib import Path
 
 import pytest
 
 import testthing
 
 
-pytest_plugins = ["pytest_asyncio"]
-
-
 @pytest.fixture
 async def machine() -> AsyncGenerator[testthing.VirtualMachine, None]:
     image = os.getenv("TEST_IMAGE")
     if not image:
         raise RuntimeError("TEST_IMAGE environment variable must be set")
-    private = Path(__file__).parent / "identity"
-    private.chmod(0o600)  # ssh will ignore it otherwise
     with testthing.IpcDirectory() as ipc:
-        async with testthing.VirtualMachine(
-            image=image, ipc=ipc, identity=(private, None), verbose=True
-        ) as vm:
+        async with testthing.VirtualMachine(image=image, ipc=ipc, verbose=True) as vm:
             yield vm
 
 
@@ -34,7 +26,12 @@ async def test_basic(machine: testthing.VirtualMachine) -> None:
         await m.execute("touch /a")
 
     # the content of /sysroot is what we expect
-    assert await m.execute("ls /sysroot") == "composefs\nlost+found\nstate\n"
+    expected = set[str](("composefs", "state"))
+    if os.getenv("FS_FORMAT", "") in ("ext4", ""):
+        expected.add("lost+found")
+
+    output = await m.execute("ls /sysroot")
+    assert set(output.splitlines()) == expected
 
     # make sure /etc and /var persist across a reboot
     await m.write("/etc/persists.conf", "hihi conf")