Arm stall watch once the Tk loop runs
Some checks are pending
md-naming / markdown naming convention (push) Waiting to run
pre-commit / pre-commit (${{ matrix.group }}) (flutter, flutter-analyze, ) (push) Waiting to run
pre-commit / pre-commit (${{ matrix.group }}) (mypy, mypy, ) (push) Waiting to run
pre-commit / pre-commit (${{ matrix.group }}) (pylint, pylint, ) (push) Waiting to run
pre-commit / pre-commit (${{ matrix.group }}) (rest, , mypy,pylint,flutter-analyze,dependency-freshness) (push) Waiting to run
Tests / test (push) Waiting to run
Tests / lock-popup-safety (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (0) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (1) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (2) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (3) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (4) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (5) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (6) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (7) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (8) (push) Waiting to run
Tests / flutter test (shard ${{ matrix.shard }}) (9) (push) Waiting to run
Tests / flutter-coverage (push) Blocked by required conditions
Tests / web-coverage (push) Waiting to run
repo-contract / repo contract (push) Waiting to run

The watch was armed in __init__, before the lock window build
(xrandr, setxkbmap, surfaces, grab), so the ~1.5 s build was reported
as a tk.mainloop freeze. Arm it via after_idle in run() instead; a real
freeze after the loop starts is still reported.

Error-Signature: screen-locker:c890f31a21

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Krzysztof Rudnicki 2026-11-20 11:11:46 +01:00
parent 26853a9dfe
commit 2987d6efa7
2 changed files with 21 additions and 4 deletions

View File

@ -142,8 +142,6 @@ class ScreenLocker(
self._check_early_exits()
try:
self.root = GateRoot()
if _errors.SLOT.reporter is not None:
watch_stalls(self.root, _errors.SLOT.reporter)
except tk.TclError as exc:
_logger.warning(
"Could not open a window on DISPLAY=%s (%s) — this run cannot "
@ -237,6 +235,9 @@ class ScreenLocker(
def run(self) -> None:
"""Start the Tkinter main event loop."""
if (reporter := _errors.SLOT.reporter) is not None:
# Armed here, not in __init__: the build is no freeze (c890f31a21).
self.root.after_idle(lambda: watch_stalls(self.root, reporter))
if self._lock is not None:
self._lock.run()
else:

View File

@ -43,12 +43,25 @@ def test_cli_installs_the_reporter_before_any_mode() -> None:
def test_lock_window_watches_stalls_once_installed(
monkeypatch: pytest.MonkeyPatch, mock_tk: MagicMock, tmp_path: Path
) -> None:
"""A lock window built after install reports its own freezes."""
"""A lock window built after install reports its own freezes.
The watch arms only once the event loop is pumping: building the window
(xrandr scan, setxkbmap, surfaces, grab) runs before ``mainloop`` and
nothing is on screen to freeze yet, so arming it in ``__init__`` reported
the build as a 1.5 s ``tk.mainloop`` stall (screen-locker:c890f31a21).
"""
watch = MagicMock()
monkeypatch.setattr(screen_lock, "watch_stalls", watch)
monkeypatch.setattr(_errors.SLOT, "reporter", MagicMock())
locker = create_locker(mock_tk, tmp_path)
watch.assert_not_called()
locker._lock = None
locker.run()
(arm,) = locker.root.after_idle.call_args.args
watch.assert_not_called()
arm()
watch.assert_called_once_with(locker.root, _errors.SLOT.reporter)
locker.root.mainloop.assert_called_once()
def test_lock_window_skips_the_watch_without_install(
@ -57,5 +70,8 @@ def test_lock_window_skips_the_watch_without_install(
"""Tests and library callers that never installed get no watch."""
watch = MagicMock()
monkeypatch.setattr(screen_lock, "watch_stalls", watch)
create_locker(mock_tk, tmp_path)
locker = create_locker(mock_tk, tmp_path)
locker._lock = None
locker.run()
locker.root.after_idle.assert_not_called()
watch.assert_not_called()