CI-035 forward admin storage live options

Author: Threepwood-7

emule_workspace/certification.py

@@ -265,6 +265,7 @@ def _invoke_step(
                 profile_cpu=True,
                 profile_cpu_stack=True,
                 profile_memory=True,
+                admin_volume_fixtures=True,
             ),
         )
         return
@@ -347,6 +348,7 @@ def _live_options(
     profile_cpu: bool = False,
     profile_cpu_stack: bool = False,
     profile_memory: bool = False,
+    admin_volume_fixtures: bool = False,
     rest_cold_start_dump_stress_cpu_profile: bool = False,
     rest_cold_start_dump_stress_cpu_profile_stack: bool = False,
 ) -> LiveE2eOptions:
@@ -369,6 +371,7 @@ def _live_options(
         profile_cpu=profile_cpu,
         profile_cpu_stack=profile_cpu_stack,
         profile_memory=profile_memory,
+        admin_volume_fixtures=admin_volume_fixtures,
         rest_cold_start_dump_stress_cpu_profile=rest_cold_start_dump_stress_cpu_profile,
         rest_cold_start_dump_stress_cpu_profile_stack=rest_cold_start_dump_stress_cpu_profile_stack,
     )

emule_workspace/cli.py

@@ -147,6 +147,10 @@ def _live_e2e_options(function: F) -> F:
     @click.option("--skip-live-seed-refresh", is_flag=True, help="Reuse the existing live seed state.")
     @click.option("--startup-trace-mode", type=click.Choice(["required", "optional"]), default="required", show_default=True)
     @click.option("--shared-root", default=None, help="Shared file root for live UI scenarios.")
+    @click.option("--admin-volume-fixtures", is_flag=True, help="Enable admin-only VHD drive-letter and folder-mount live fixtures.")
+    @click.option("--vhd-size-mb", default=256, show_default=True, type=int)
+    @click.option("--mount-root", default=None, help="Parent directory for admin-only folder mount fixtures.")
+    @click.option("--keep-admin-fixtures", is_flag=True, help="Leave admin VHD fixture files after a live suite for inspection.")
     @click.option("--preference-ui-directories-tree-stress", is_flag=True, help="Exercise the Preferences Directories tree with a large shared-directory profile.")
     @click.option("--shared-files-ui-scenario", "shared_files_ui_scenarios", multiple=True)
     @click.option("--shared-files-tree-stress-churn-cycles", default=-1, show_default=True, type=int)

emule_workspace/config.py

@@ -94,6 +94,10 @@ class LiveE2eOptions(BaseModel):
     preference_ui_directories_tree_stress: bool = False
     shared_files_ui_scenarios: tuple[str, ...] = ()
     shared_files_tree_stress_churn_cycles: int = -1
+    admin_volume_fixtures: bool = False
+    vhd_size_mb: int = 256
+    mount_root: str | None = None
+    keep_admin_fixtures: bool = False
     profile_cpu: bool = False
     profile_cpu_max_file_mb: int = 512
     profile_cpu_stack: bool = False

emule_workspace/test_runs.py

@@ -348,6 +348,11 @@ def invoke_live_e2e_suite(layout: WorkspaceLayout, options: WorkspaceOptions, li
     _append_optional_flag(args, live_options.rest_stop_start_after_churn, "--rest-stop-start-after-churn")
     if live_options.shared_root:
         args.extend(["--shared-root", live_options.shared_root])
+    _append_optional_flag(args, live_options.admin_volume_fixtures, "--admin-volume-fixtures")
+    args.extend(["--vhd-size-mb", live_options.vhd_size_mb])
+    if live_options.mount_root:
+        args.extend(["--mount-root", live_options.mount_root])
+    _append_optional_flag(args, live_options.keep_admin_fixtures, "--keep-admin-fixtures")
     _append_optional_flag(args, live_options.preference_ui_directories_tree_stress, "--preference-ui-directories-tree-stress")
     for scenario_name in live_options.shared_files_ui_scenarios:
         args.extend(["--shared-files-ui-scenario", scenario_name])

tests/test_certification.py

@@ -280,5 +280,6 @@ def fake_live_e2e(_layout, _options, live_options):
     assert captured[0].profile_cpu is True
     assert captured[0].profile_cpu_stack is True
     assert captured[0].profile_memory is True
+    assert captured[0].admin_volume_fixtures is True
     assert captured[1].profile_cpu is False
     assert captured[1].profile_memory is False

tests/test_cli.py

@@ -78,6 +78,10 @@ def test_test_live_e2e_help_exposes_live_options() -> None:
     assert "--profile-cpu-stack" in result.output
     assert "--profile-memory" in result.output
     assert "--profile-resource-interval-seconds" in result.output
+    assert "--admin-volume-fixtures" in result.output
+    assert "--vhd-size-mb" in result.output
+    assert "--mount-root" in result.output
+    assert "--keep-admin-fixtures" in result.output
     assert "--rest-cold-start-dump-stress-cpu-profile" in result.output
     assert "--rest-cold-start-dump-stress-cpu-profile-stack" in result.output
 

tests/test_live_e2e_options.py

@@ -133,6 +133,35 @@ def fake_run_native(command, *, label, cwd, env=None, allow_failure=False):
     assert option_values(command, "--shared-root") == [r"C:\tmp\large-shared-root"]
 
 
+def test_live_e2e_forwards_admin_volume_fixture_options(tmp_path: Path, monkeypatch) -> None:
+    captured: dict[str, object] = {}
+
+    def fake_run_native(command, *, label, cwd, env=None, allow_failure=False):
+        captured["command"] = list(command)
+
+    layout = make_layout(tmp_path)
+    monkeypatch.setattr(test_runs, "run_native", fake_run_native)
+
+    test_runs.invoke_live_e2e_suite(
+        layout,
+        WorkspaceOptions(workspace_root=tmp_path, platform="x64"),
+        LiveE2eOptions(
+            suites=("shared-cache-volume-identity",),
+            admin_volume_fixtures=True,
+            vhd_size_mb=384,
+            mount_root=r"C:\tmp\emulebb-admin-mounts",
+            keep_admin_fixtures=True,
+        ),
+    )
+
+    command = captured["command"]
+    assert isinstance(command, list)
+    assert "--admin-volume-fixtures" in command
+    assert option_values(command, "--vhd-size-mb") == ["384"]
+    assert option_values(command, "--mount-root") == [r"C:\tmp\emulebb-admin-mounts"]
+    assert "--keep-admin-fixtures" in command
+
+
 def test_live_e2e_forwards_search_ui_live_stress_options(tmp_path: Path, monkeypatch) -> None:
     captured: dict[str, object] = {}