Files
Octop/tests/unit/utils/test_posix_compat.py
6676377d06 fix: remote desktop, browser, terminal, and setup locale (#11)
* fix: harden remote desktop setup on macOS and Linux

Show macOS TCC permission guidance when deps are ready but capture is blocked, and treat incomplete Linux installs (missing systemd units) as needs_install so install is retried instead of a broken start-only path.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: pin desktop icon size and prefer bundled wallpaper

Set xfdesktop icon-size to 48 so Ubuntu hosts match Docker defaults, and install the local wallpaper.png before falling back to remote download.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: force larger xfdesktop icons and clear stale xfce config

Bump default desktop icon-size to 72, apply it via a dedicated post-start script with verification/reload, and remove leftover xfce4 desktop config on uninstall/reinstall so Ubuntu hosts no longer keep tiny icons.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: fix tiny desktop icons via VNC DPI and icon themes

Headless TigerVNC without -dpi makes fonts and labels look normal while xfdesktop icons stay as fixed tiny pixels. Install Adwaita icons (skipped by --no-install-recommends), force -dpi 96, and hard-restart xfdesktop after applying size/theme.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: install SVG icon loader and materialize desktop launcher PNGs

Tiny desktop icons on Ubuntu came from missing librsvg2-common (Adwaita SVGs) plus xfconf applied without the session D-Bus. Install the pixbuf SVG loader, write static xsettings, render launcher icons to PNGs, and log apply-icon-size failures.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: restore normal desktop icons/panel and clarify terminal WS logs

Revert oversized letter-tile icon fallbacks to 48px theme icons, seed a default xfce4-panel with Applications menu, and add terminal websocket accept/close logging plus tolerant agent-id resolution.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: stabilize web terminal and polish remote desktop chrome

Fix macOS PTY spawn (setsid None), harden terminal reconnect/error handling,
move the XFCE start button to a top panel with the Octop logo, and replace
full-height edge rails with corner controls that no longer block desktop edges.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: put start menu on bottom panel and open appfinder for menu shortcut

Restore the XFCE panel to the bottom edge, bind Super/Alt-F1 to xfce4-appfinder
in openbox, and make the remote-desktop「开始菜单」action spawn appfinder
instead of relying on an unbound Alt+F1 chord.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: keep XFCE start button across desktop service restarts

Hard-reset xfconfd when seeding the panel so in-memory channel state cannot
override our launcher XML, keep a canonical panel layout under /opt, and stop
apply-icon-size from re-entering ensure-panel (which raced and dropped the
start button after restarts).

Co-authored-by: Cursor <cursoragent@cursor.com>

* refactor: trim remote-desktop dead weight without dropping fixes

Drop unused whiskermenu packaging and duplicate panel reseeds, narrow D-Bus
env parsing to session bus keys, prefer a single appfinder spawn for the menu
shortcut, and demote terminal happy-path logs back to info.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: ship Octop wallpaper.png as the default virtual desktop backdrop

Use the packaged asset next to install.sh (no COS download by default), avoid
center-cropping the lower-right brand mark, and keep a copy under /opt.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: ship Octop wallpaper.png as the default virtual desktop backdrop

Use the packaged asset next to install.sh (no COS download by default), avoid
center-cropping the lower-right brand mark, and keep a copy under /opt.

Co-authored-by: Cursor <cursoragent@cursor.com>

* feat: align remote browser with desktop HUD and safer Chromium lifecycle

Detect system Chrome/Chromium via find_chrome for env readiness and launch,
fall back to Playwright install when missing, and uninstall only Playwright
Chromium. Match StreamEdgeControls hover HUD and install/uninstall viewport
layout with remote desktop; clear stale profile locks before attach.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: make remote browser launch writable and show on virtual desktop

Force a private XDG_RUNTIME_DIR, recreate non-writable harness profiles,
and inject DISPLAY=:99 when Xvnc is up so Chrome starts headed on the
remote desktop instead of failing with ProcessSingleton exit 21.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: persist setup wizard UI locale on initial admin

Create the first admin with the wizard's current language (or
Accept-Language) instead of hard-coding zh, so Finish/login no longer
silently switches English browsers to Chinese after setup.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ui): narrow stream HUD hover hotzone to HUD width

Only the centered top strip (~320px) captures hover so left/right
stream content stays click-through. Also reformat remote desktop and
terminal control pages.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(remote-browser): persist stream open/closed across page visits

Remember whether the user left the stream running, and only auto-
reconnect on enter when it was open (or deep-linked via ?thread=).

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(browser): relocate root profiles and bump harness-browser 0.7.4

Host agents can allow Python writes under /root but deny Chrome
SingletonLock creation. Proactively use /tmp profiles, pin
ProfileManager to the resolved base dir, require harness-browser
0.7.4 for launch-time XDG/env injection, and refresh the lockfile.

Co-authored-by: Cursor <cursoragent@cursor.com>

* style: format browser setup unit test for ruff

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(test): rename browser setup tests to avoid basename clash

pytest cannot collect both unit/browser/test_setup.py and
unit/desktop/test_setup.py under the same module name.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(typecheck): use posix_compat.chown for Windows mypy

os.chown is unavailable on Windows stubs; route ownership fixes through
the shared posix_compat helper like the rest of infra.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(test): expect catalog label for bootstrapped main agent

Setup now uses the general-assistant manifest name (小通 · 通用助手)
instead of a hard-coded 通用助手 string.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix: honor macOS /private and tempfile paths in host guards

/etc resolves to /private/etc on macOS, so strip that prefix before
denied-prefix checks. Allow media previews from tempfile.gettempdir()
(/var/folders/…) in addition to /tmp.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(test): make browser binary verify fixture work on Windows

The fake Chrome was a shebang shell script, which Windows cannot
execute. Use a .bat stub on nt so --version verification succeeds.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: jubaoliang <jubaoliang@tencent.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-13 20:30:56 +08:00

29 lines
825 B
Python

"""Tests for POSIX compat helpers used by the web terminal."""
from __future__ import annotations
import os
import pytest
from octop.infra.utils import posix_compat
posix_only = pytest.mark.skipif(os.name != "posix", reason="POSIX only")
@posix_only
def test_setsid_tolerates_none_return(monkeypatch: pytest.MonkeyPatch) -> None:
"""macOS ``os.setsid()`` returns None; wrapping that in ``int()`` must not raise.
A raising ``preexec_fn`` aborts the PTY shell spawn and the web terminal
immediately shows “process exited”.
"""
monkeypatch.setattr(os, "setsid", lambda: None)
assert posix_compat.setsid() == 0
@posix_only
def test_setsid_preserves_int_return(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(os, "setsid", lambda: 42)
assert posix_compat.setsid() == 42