Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions tst/integration/computer/base_computer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
pytestmark = [pytest.mark.integration, pytest.mark.int_test_slow]

SUPERVISOR = ["supervisorctl", "-c", "/etc/supervisor/supervisord.conf", "status"]
#: How long the window manager may take to claim the screen once supervisord has the desktop RUNNING, and how often the
#: root window is read meanwhile, in seconds.
WINDOW_MANAGER_S, WINDOW_MANAGER_POLL_S = 60, 0.5
ARCH = {"x86_64": "amd64", "amd64": "amd64", "aarch64": "arm64", "arm64": "arm64"}[platform.machine().lower()]


Expand All @@ -53,7 +56,7 @@ def test_the_desktop_runs_as_the_session_user_with_the_settings_a_deploy_passes(
zone = _exec(name, "readlink", "/etc/localtime").strip()
uid = _exec(name, "id", "-u", "user").strip()
screen = _exec(name, "xdpyinfo")
wm = _exec(name, "xprop", "-root", "_NET_SUPPORTING_WM_CHECK")
wm = _window_manager(name)
# As the session user, whose process it is: root here lacks the ptrace capability to read another's.
environment = _exec_as(name, "user", "sh", "-c", 'tr "\\0" "\\n" < /proc/$(pgrep -o -x xfwm4)/environ')
accessibility = _exec(name, "pgrep", "-c", "at-spi2-registr")
Expand Down Expand Up @@ -86,7 +89,7 @@ def test_the_desktop_comes_back_however_often_x_dies(base):
time.sleep(1.2)
time.sleep(5)
running = _all_running(name)
wm = _exec(name, "xprop", "-root", "_NET_SUPPORTING_WM_CHECK")
wm = _window_manager(name)
finally:
subprocess.run(["docker", "rm", "-f", name], capture_output=True)
assert all(" RUNNING " in line for line in running.splitlines()), running
Expand Down Expand Up @@ -227,5 +230,17 @@ def _all_running(name: str) -> str:
return running


def _window_manager(name: str) -> str:
"""The root window's WM check once xfwm4 sets it: supervisord has the desktop RUNNING as its process starts
(startsecs=0), which then waits for X and starts the XFCE session, which starts xfwm4."""
deadline = time.monotonic() + WINDOW_MANAGER_S
while True:
wm = subprocess.run(["docker", "exec", name, "xprop", "-root", "_NET_SUPPORTING_WM_CHECK"], capture_output=True,
text=True).stdout
if "window id #" in wm or time.monotonic() > deadline:
return wm
time.sleep(WINDOW_MANAGER_POLL_S)


def _exec(name: str, *argv: str) -> str:
return subprocess.run(["docker", "exec", name, *argv], check=True, capture_output=True, text=True).stdout
Loading