6efd5b4749
`hermes computer-use screen install` was a second installer: it ran the package command with shell=True and bypassed install._running, so a CLI install and a Desktop-pane Install could run the same apt transaction concurrently. It now calls install.install_packages with a getpass password callback and print as the line sink, sharing the per-profile slot, the list-form spawn and the stdin (-S) sudo hand-off. -y keeps its meaning (skip the confirmation prompt). (cherry picked from commit 45f58eb19a0e72ee01bae8bd101d28dd59b5b451)
30 lines
1.3 KiB
Python
30 lines
1.3 KiB
Python
"""`hermes computer-use screen install` shares the Desktop pane's installer (one lock, list-form spawn)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import subprocess
|
|
|
|
from hermes_cli.subcommands.computer_use_screen import build_screen_parser
|
|
from tools.bot_desktop import install, runtime
|
|
|
|
|
|
def test_cli_install_goes_through_the_shared_installer(monkeypatch):
|
|
monkeypatch.setattr(runtime, "is_supported_host", lambda: True)
|
|
monkeypatch.setattr(runtime, "missing_binaries", lambda: ["Xvnc"])
|
|
monkeypatch.setattr(runtime, "install_command", lambda: "sudo apt-get install -y tigervnc-standalone-server")
|
|
monkeypatch.setattr(subprocess, "run", lambda *a, **k: (_ for _ in ()).throw(AssertionError("shell install spawned")))
|
|
calls = []
|
|
|
|
def fake_install(*, ask_password, on_line, **kw):
|
|
calls.append((callable(ask_password), callable(on_line)))
|
|
return 0
|
|
|
|
monkeypatch.setattr(install, "install_packages", fake_install)
|
|
monkeypatch.setattr(runtime, "missing_binaries", lambda: ["Xvnc"] if not calls else [])
|
|
parser = argparse.ArgumentParser()
|
|
build_screen_parser(parser.add_subparsers(), lambda sub, help_text: sub.add_argument("--json", action="store_true"))
|
|
args = parser.parse_args(["screen", "install", "-y"])
|
|
assert args.screen_func(args) == 0
|
|
assert calls == [(True, True)]
|