quality-loop 0.4.1__tar.gz → 0.4.2__tar.gz

{quality_loop-0.4.1/quality_loop.egg-info → quality_loop-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quality-loop
-Version: 0.4.1
+Version: 0.4.2
 Summary: Measure what a product teaches - its skill, tools or manual - with isolated agent runs of real tasks, reported by an operator agent
 Author: craftware
 License-Expression: MIT

{quality_loop-0.4.1 → quality_loop-0.4.2}/quality_loop/__init__.py

@@ -12,4 +12,4 @@ room is handed, putting the user's machine back - is code here, not an
 agent's discretion.
 """
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"

{quality_loop-0.4.1 → quality_loop-0.4.2}/quality_loop/guest/__init__.py

@@ -483,8 +483,14 @@ class TartMachine:
 class VMwareMachine:
     """A VMware Fusion VM reverted to a snapshot before the run.
 
-    A snapshot taken while the VM was running comes back running, signed in
-    and with SSH up, after `vmrun start`. The SMB share that was mounted on
+    Take the snapshot with the VM shut down, so that every run boots it. A
+    snapshot taken while it ran comes back running, signed in and with SSH
+    up, in seconds - and with whatever was half done at that moment, every
+    time: Keyhac's image came back with Notepad's hand-off to its packaged
+    app broken, so `notepad.exe` started the inbox one, which crashed within
+    seconds on every run, while the same VM booted was fine. On Windows, the
+    run waits for the automatic sign-in, which the image must have. The SMB
+    share that was mounted on
     the host does not survive the revert, so it is mounted again. The VM is
     shut down afterwards, its share unmounted first: the next run reverts it
     anyway, and a VM `vmrun` left running headless is one the Fusion app
@@ -495,8 +501,7 @@ class VMwareMachine:
     Learnt on Fusion 26 with a vTPM-encrypted Windows 11 VM: `vmrun` cannot
     linked-clone it ("Cannot read the virtual machine configuration file"),
     nor snapshot it while it runs ("Authentication for encrypted virtual
-    machine failed") - take a running-state snapshot in the Fusion app, after
-    `vmrun suspend` (a headless VM does not show there).
+    machine failed"). Shut down, `vmrun -vp <password> snapshot` takes it.
     """
 
     VMRUN = "/Applications/VMware Fusion.app/Contents/Library/vmrun"
@@ -533,9 +538,36 @@ class VMwareMachine:
                              f"to {self.snapshot!r}")
         self._mount()
         self._wait_for_the_clock()
+        if self.guest.windows:
+            self._wait_for_the_desktop()
         print(f"vm:      {self.guest.alias} reverted to {self.snapshot!r}")
         return self
 
+    def _wait_for_the_desktop(self, settle: float = 15.0) -> None:
+        """Wait until the guest's user is signed in, and has been for
+        ``settle`` seconds.
+
+        A booted VM answers SSH before the automatic sign-in has made the
+        desktop session `launch` starts programs in, and that session's
+        first seconds are its startup programs; the run starts after both.
+        A running-state snapshot is past them at once.
+        """
+        deadline = time.monotonic() + self.patience
+        while time.monotonic() < deadline:
+            said = self.guest.ssh(
+                "$e = Get-Process explorer -ErrorAction SilentlyContinue | "
+                "Where-Object { $_.SessionId -gt 0 } | Select-Object -First 1; "
+                "if ($e) { [int]((Get-Date) - $e.StartTime).TotalSeconds } else { -1 }")
+            try:
+                up = int(said.stdout.strip())
+            except ValueError:
+                up = -1
+            if up >= settle:
+                return
+            time.sleep(settle - up if up >= 0 else 3.0)
+        raise GuestError(f"{self.guest.alias}: no signed-in desktop after "
+                         f"{self.patience:.0f}s - is automatic sign-in set up?")
+
     def _mount(self) -> None:
         url = self.guest.settings.get("smb")
         if not url:

{quality_loop-0.4.1 → quality_loop-0.4.2/quality_loop.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quality-loop
-Version: 0.4.1
+Version: 0.4.2
 Summary: Measure what a product teaches - its skill, tools or manual - with isolated agent runs of real tasks, reported by an operator agent
 Author: craftware
 License-Expression: MIT

{quality_loop-0.4.1 → quality_loop-0.4.2}/tests/test_guest.py

@@ -208,6 +208,30 @@ def test_a_terminal_script_is_staged_and_run_with_the_guest_python(share, monkey
     assert (stage / "scripts" / "deploy.py").exists()
 
 
+def test_a_booted_windows_guest_is_waited_for_until_its_desktop_has_settled(share, monkeypatch):
+    """A powered-off snapshot boots: SSH answers before the automatic sign-in
+    has made the desktop, and then its startup programs run."""
+    guest = _guest(share, windows=True, vmx="/v.vmx", snapshot="s")
+    answers = iter(["-1", "-1", "4", "16"])
+    ssh = FakeSSH(lambda c: (next(answers) + "\n", 0))
+    monkeypatch.setattr(guest, "ssh", ssh)
+    slept = []
+    monkeypatch.setattr(guests.time, "sleep", slept.append)
+    guests.VMwareMachine(guest)._wait_for_the_desktop(settle=15)
+    assert len(ssh.commands) == 4 and "explorer" in ssh.commands[0]
+    assert slept == [3.0, 3.0, 11]
+
+
+def test_no_desktop_is_an_error_that_names_automatic_sign_in(share, monkeypatch):
+    guest = _guest(share, windows=True, vmx="/v.vmx", snapshot="s")
+    monkeypatch.setattr(guest, "ssh", FakeSSH(lambda c: ("-1\n", 0)))
+    clock = iter(range(0, 1000, 50))
+    monkeypatch.setattr(guests.time, "monotonic", lambda: next(clock))
+    monkeypatch.setattr(guests.time, "sleep", lambda s: None)
+    with pytest.raises(GuestError, match="automatic sign-in"):
+        guests.VMwareMachine(guest, patience=120)._wait_for_the_desktop()
+
+
 def test_machine_follows_the_settings(share):
     assert isinstance(_guest(share, tart="base").machine(), guests.TartMachine)
     assert isinstance(_guest(share, vmx="/v.vmx", snapshot="s").machine(), guests.VMwareMachine)