Fix fixture mouse integration and capture clean USB-tablet baseline

This commit is contained in:
cabbage committed 2026-10-08 09:36:13 +00:00
1 parent 6ccaaae3c7
commit 90d6b05f4d
10 files changed
+424 -43

No files matched your search

+27 -16
View File
@@ -6,7 +6,7 @@ Windows release matrix. Keep the values here in sync with the VM before adding
or changing native test automation.
Last configuration check: 2026-10-08 UTC. A powered-off clean
`baseline-clean-python-ready` snapshot was captured, restored, and boot-verified.
`baseline-clean-python-usb-ready` snapshot was captured, restored, and boot-verified.
The native harness targets that snapshot;
the fixture is ready for native runs. A test run must still perform its own identity,
snapshot, readiness, and exclusive-lease checks rather than relying on that
@@ -27,7 +27,7 @@ observation.
| Guest OS | Windows 10 Pro 22H2, build `19045.6456` verified after the baseline's pending Windows servicing restart; en-US, BIOS boot (original install build `19045.2006`) |
| Guest account | Local `rvboxtest`; split-token local administrator; console session 1 was observed during provisioning |
| Guest Additions | `7.2.16r174877`; readiness requires published Guest Additions version and Windows OS-release properties (this build does not publish a RunLevel property) |
| Last observed state | `running` for interactive access; current snapshot `baseline-clean-python-ready`, the reset target for native runs; verify live state and lease before mutations |
| Last observed state | `running` for interactive access; current snapshot `baseline-clean-python-usb-ready`, the reset target for native runs; verify live state and lease before mutations |
| Baseline Python | Python `3.13.16` amd64 at `C:\Python313`; machine PATH, `py` launcher, bundled pip and venv; no third-party packages |
The two fixture accounts deliberately share one fixed test-only password for
@@ -56,7 +56,7 @@ remain private and are not part of this test-only credential exception.
| System disk | 40 GiB dynamically allocated VDI; logical base path `/home/cabbage/VMs/rvbox-win10-test.vdi`; active snapshot differencing disks live under the snapshot folder above |
| Install media | `/media/Data2/Downloaded/Win10_22H2_English_x64.iso`, Windows image index 6 |
| Audio | Virtual audio disabled (`audio=none`, playback and capture off) |
| USB | OHCI, EHCI, and xHCI disabled; no USB filters |
| USB / input | OHCI enabled; EHCI and xHCI disabled; USB tablet, PS/2 keyboard, no USB passthrough filters; Windows mouse-class `UpperFilters = mouclass`, `VBoxMouse` detached/stopped, standard `mouclass`/`mouhid` drivers active |
| Clipboard / drag and drop | Disabled, including clipboard file transfers |
| Network adapter | One Intel 82540EM adapter, cable connected, NAT attachment; MAC `080027036E7C` |
| Shared folders | None; there is no shared-folder contract for tests |
@@ -75,7 +75,7 @@ hard-coded into a harness.
| --- | --- |
| Host management | SSH to `helium-remote`, then invoke `VBoxManage`; do not assume `VBoxManage` is installed on the Linux controller |
| Guest management | VirtualBox Guest Control over the host; use explicit executable/argument vectors and the password file above |
| VRDE (VirtualBox RDP) | Enabled for diagnostics on Helium loopback at `127.0.0.1:3389`; external authentication, `VBoxAuthSimple` user `rvboxtest`, `Security/Method=negotiate`, single connection reuse, multiconnection off. Reach it only through an explicitly temporary, private SSH forward. |
| VRDE (VirtualBox RDP) | Enabled for diagnostics on Helium loopback at `127.0.0.1:3389`; external authentication, `VBoxAuthSimple` user `rvboxtest`, `Security/Method=RDP`, single connection only, multiconnection and connection reuse off. Reach it only through an explicitly temporary, private SSH forward. |
| VRDE TLS material | Auto-generated certificate and private key under `/home/cabbage/VirtualBox VMs/RVBox/Tests/rvbox-win10-test/`; keep both on Helium and do not copy them into the repository or test artifacts |
| VRDE channels | Input/display enabled; audio, upstream audio, USB, clipboard, and RDP device redirection disabled; no video channel |
| Native Windows RDP forward | NAT rule `rvbox-rdp`: host `192.168.50.162:3390` to guest port `3389` |
@@ -103,14 +103,16 @@ copy/paste example and explains the native-host lease boundary.
## Snapshots and reset contract
Five snapshots are retained. `baseline-clean-python-ready`
Six snapshots are retained. `baseline-clean-python-usb-ready`
is the only reset target: it contains no `RVBoxClient` SCM service, RVBox tray
Run-key registration, RVBox state, logs, or staged binaries; it also has the
fixture-only built-in `Administrator` account enabled for high-token Guest
Control installation, plus Python, pip, and venv for repeatable interactive tests.
It is a powered-off descendant of `baseline-clean-administrator`, captured after
the first Python snapshot's pending Windows servicing restart completed; the
original parent and both older diagnostic snapshots remain unchanged.
It is a powered-off descendant of `baseline-clean-python-ready`, with a standard
USB tablet and the unnecessary `VBoxMouse` class filter detached. The prior
baseline had already completed the initial Python capture's Windows servicing
restart. Every older snapshot is retained unchanged. The canonical baseline
contains the small mouse-filter rollback record, not an installed RVBox client.
| Snapshot | UUID | Description |
| --- | --- | --- |
@@ -118,23 +120,29 @@ original parent and both older diagnostic snapshots remain unchanged.
| `baseline-disk-first` | `9430a9a4-754a-4b22-beaa-8dfd90043f5b` | `baseline-windows10-pro-22h2-disk-first`; retained diagnostic snapshot |
| `baseline-clean-administrator` | `ba5ce5f1-77e3-44b0-8d91-534becce27ff` | `baseline-windows10-pro-22h2-administrator-enabled-full-token`; retained pre-Python parent |
| `baseline-clean-python` | `2d00a8a2-a7cf-4f7b-bee2-80bd71574e89` | Retained initial Python capture, before its first-restore Windows servicing restart completed; diagnostic only |
| `baseline-clean-python-ready` | `dfadee95-156f-43ee-bdab-a10a44be4070` | Clean RVBox fixture; full-token Administrator; Python 3.13.16 amd64, pip and venv; no RVBox installation or pending Windows servicing reboot; current reset target |
| `baseline-clean-python-ready` | `dfadee95-156f-43ee-bdab-a10a44be4070` | Retained clean Python/servicing-ready parent; still has the original mouse-integration filter; diagnostic only |
| `baseline-clean-python-usb-ready` | `a4851b6a-24d6-42f8-96c2-ff9f554c9198` | Current reset target: clean RVBox fixture; full-token Administrator; Python 3.13.16 amd64 on machine PATH, pip and venv; USB tablet and standard drivers, `VBoxMouse` detached; no RVBox installation or pending Windows servicing reboot |
Restore only while the VM is powered off. Every destructive or potentially
stateful run must:
1. Acquire the run lease and verify the VM name, UUID, and snapshot UUID.
2. Restore `baseline-clean-python-ready` if the current state is not the baseline.
2. Restore `baseline-clean-python-usb-ready` if the current state is not the baseline;
normalize OHCI/USB-tablet and VRDE input settings before boot.
3. Start headless and wait for `VMState=running` plus Guest Additions readiness
(bounded 240-second window for cold boots/servicing restarts).
4. Apply the disposable display/sleep keepalive (`monitor-timeout`, standby,
and hibernate timers set to zero) so VirtualBox VRDE cannot expose a
zero-bpp framebuffer after Windows idle timeout. This is recorded as
`prepare-display-keepalive` and is reapplied after every snapshot restore.
Require healthy standard mouse drivers and USB input, with `VBoxMouse`
absent from the class filter and stopped; `prepare-usb-mouse-verified` records
that check. A regression fails preparation instead of silently reviving the
broken path. See the reversible [mouse-filter recovery](../test/rdp-access/README.md#opt-in-mouse-filter-workaround-and-rollback).
5. Run the bounded test, collect redacted artifacts, and close every Guest
Control process that was opened by the run.
6. Request a graceful guest shutdown and wait for `VMState=poweroff`.
7. Restore `baseline-clean-python-ready` again and leave the VM powered off.
7. Restore `baseline-clean-python-usb-ready` again and leave the VM powered off.
Use `controlvm ... poweroff` only for a hung, disposable test; it can lose
guest state. Never delete any clean snapshot, unregister the VM, or alter
@@ -144,7 +152,7 @@ the stale unregistered `win10_dev` configuration (its disk is missing).
### Python-enabled baseline
Python is part of `baseline-clean-python-ready`, not a per-run installation. Every
Python is part of `baseline-clean-python-usb-ready`, not a per-run installation. Every
normal `test-host prepare`/`reset` restores it together with the clean Windows
fixture. No Python installer, bootstrap script, verification venv, or RVBox
installation is retained in that snapshot. Both accounts can run `python`,
@@ -194,8 +202,11 @@ and successful venv creation with bundled pip under both Administrator and
`rvboxtest`. Capture additionally refuses an installed RVBox service, normal
installation/state directories, or tray Run-key registration; requires no
logged-on provisioning Administrator and no Windows servicing reboot pending;
deletes only `C:\ProgramData\RVBoxFixture`
bootstrap data; requests graceful shutdown; and takes a **powered-off** snapshot.
requires the healthy USB-tablet path with `VBoxMouse` detached/stopped; removes
only the owned Python installer staging directory and bootstrap scripts (not
the mouse-filter rollback record); requests graceful shutdown; and takes a
**powered-off** snapshot. Its verification script is staged afresh, so capture
does not require reinstalling Python in an already Python-enabled fixture.
It prints the new snapshot name and UUID and releases the lease. It never
forces shutdown just to obtain a baseline and never blindly retries capture.
@@ -241,8 +252,8 @@ The adapter takes identity and credentials only from its environment:
export RVBOX_TEST_VBOX_HOST=helium-remote
export RVBOX_TEST_VBOX_VM=rvbox-win10-test
export RVBOX_TEST_VBOX_VM_UUID=6cdc114f-71e5-4167-a394-e922e14e6f5c
export RVBOX_TEST_VBOX_SNAPSHOT=baseline-clean-python-ready
export RVBOX_TEST_VBOX_SNAPSHOT_UUID=dfadee95-156f-43ee-bdab-a10a44be4070
export RVBOX_TEST_VBOX_SNAPSHOT=baseline-clean-python-usb-ready
export RVBOX_TEST_VBOX_SNAPSHOT_UUID=a4851b6a-24d6-42f8-96c2-ff9f554c9198
export RVBOX_TEST_GUEST_USER=rvboxtest
export RVBOX_TEST_GUEST_PASSWORD_FILE=/home/cabbage/.local/share/rvbox-secrets/rvbox-win10-test.password
# Defaults to Administrator and the same password file; overrides are optional.