mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:27:13 +01:00
Krzysztof kuhy Rudnicki
ec0946f64e
`requires-python` and the CI pin already said 3.14, but ruff, mypy and pylint were still grading against 3.10 -- three tools judging an interpreter nothing runs any more, and ruff withholding the pyupgrade fixes that only become safe at the newer target. `pin_ci_python.py` rewrites exactly these three knobs. What the stale target was hiding: 118 sites on `datetime.timezone.utc` instead of `datetime.UTC` (UP017), two classes still written with `Generic[...]` rather than PEP 695 syntax, and ruff's stable formatter applying PEP 758 -- `except (A, B):` becomes `except A, B:`. That last one makes the source 3.14-only at the syntax level, which is what `requires-python = ">=3.14"` already promised; kuhy chose it deliberately over holding ruff a release back (2026-08-29). The PEP 695 fix needed a hand: ruff rewrote `class WidgetGroup(Generic[_W])` to `class WidgetGroup[W: tk.Misc]` but left the body annotated with the module-level `_W`, a *different* type variable -- mypy caught it as "a function returning TypeVar should receive at least one argument containing the same TypeVar". Renamed the body to the new parameter, gave `FrameGroup.__init__` the concrete `list[tk.Frame]` it always wrapped, and deleted the two now-dead module-level TypeVars. ruff, ruff-format, mypy --strict and both pylint passes clean at the new target. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SfnJmxxsZ534AKk16rC2Gr
67 lines
2.8 KiB
Python
67 lines
2.8 KiB
Python
"""Tests for the relaxed_day_already_skipped early-exit branch."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime
|
|
from pathlib import Path
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import patch
|
|
|
|
from screen_locker._log_mixin import write_signed_entry
|
|
from screen_locker.screen_lock import ScreenLocker
|
|
|
|
if TYPE_CHECKING:
|
|
from unittest.mock import MagicMock
|
|
|
|
|
|
class TestRelaxedDayAlreadySkippedBranch:
|
|
"""RelaxedDayAlreadySkippedBranch."""
|
|
|
|
def test_relaxed_day_already_skipped_today_stays_silent(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""A same-day relaxed_day_skip entry exits quietly instead of re-showing.
|
|
|
|
Regression test: the recurring 30-minute workout-locker.timer used to
|
|
re-derive relaxed_day from scratch on every tick with no memory of an
|
|
earlier "Skip -- No Penalty" click, so the prompt kept reappearing.
|
|
"""
|
|
# Path.resolve() is patched below to always return
|
|
# tmp_path/"screen_locker", so ScreenLocker's
|
|
# script_dir.parent/"log.json" resolves to tmp_path/"log.json" -- NOT
|
|
# tmp_path/"screen_locker"/"log.json".
|
|
log_file = tmp_path / "log.json"
|
|
today = datetime.now(tz=UTC).strftime("%Y-%m-%d")
|
|
write_signed_entry(log_file, today, {"type": "relaxed_day_skip"})
|
|
|
|
with (
|
|
patch.object(Path, "resolve", return_value=tmp_path / "screen_locker"),
|
|
patch.object(ScreenLocker, "_is_sick_day_today", return_value=False),
|
|
patch.object(ScreenLocker, "_is_early_bird_pending", return_value=False),
|
|
patch.object(ScreenLocker, "_is_early_bird_time", return_value=False),
|
|
patch.object(
|
|
ScreenLocker, "_try_auto_upgrade_early_bird", return_value=False
|
|
),
|
|
patch(
|
|
"screen_locker._startup_checks.is_relaxed_day",
|
|
return_value=True,
|
|
),
|
|
patch.object(ScreenLocker, "_start_phone_check"),
|
|
patch.object(ScreenLocker, "_start_relaxed_day_flow") as mock_relaxed,
|
|
patch.object(ScreenLocker, "_start_verify_workout_check"),
|
|
):
|
|
locker = ScreenLocker(demo_mode=True)
|
|
|
|
# sys.exit is mocked (a no-op under pytest), so __init__ keeps running
|
|
# past the early return -- same as the existing
|
|
# test_has_logged_today_exits_before_relaxed_check in
|
|
# test_weekly_logic.py. The regression this guards against is real
|
|
# duplicate UI, which _relaxed_day_mode staying False and
|
|
# _start_relaxed_day_flow never firing both rule out.
|
|
mock_sys_exit.assert_called_once_with(0)
|
|
mock_relaxed.assert_not_called()
|
|
assert locker._relaxed_day_mode is False
|