mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:07:16 +01:00
`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
196 lines
6.7 KiB
Python
196 lines
6.7 KiB
Python
"""Tests targeting remaining screen_lock.py coverage gaps."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime
|
|
import json
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from screen_locker.tests.conftest import create_locker
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
class TestTryAutoUpgradeSickDayRunnerUp:
|
|
"""Tests for RunnerUp paths in _try_auto_upgrade_sick_day (lines 273-286)."""
|
|
|
|
def test_runnerup_exception_returns_false(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""OSError from _verify_runnerup_workout → returns False (lines 273-275)."""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_phone_workout",
|
|
MagicMock(return_value=("no_phone", "no phone")),
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_runnerup_workout",
|
|
MagicMock(side_effect=OSError("adb fail")),
|
|
)
|
|
assert locker._try_auto_upgrade_sick_day() is False
|
|
|
|
def test_runnerup_verified_saves_entry(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""RunnerUp returns verified → saves runnerup_verified entry (lines 281-286)."""
|
|
log_file = tmp_path / "log.json"
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {}
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_phone_workout",
|
|
MagicMock(return_value=("no_phone", "no phone")),
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_runnerup_workout",
|
|
MagicMock(return_value=("verified", "Running: 6 km in 40 min")),
|
|
)
|
|
object.__setattr__(
|
|
locker, "_adjust_shutdown_time_later", MagicMock(return_value=True)
|
|
)
|
|
with patch("screen_locker._log_mixin.compute_entry_hmac", return_value=None):
|
|
result = locker._try_auto_upgrade_sick_day()
|
|
|
|
assert result is True
|
|
today = datetime.now(tz=UTC).strftime("%Y-%m-%d")
|
|
data = json.loads(log_file.read_text())
|
|
assert data[today][0]["workout_data"]["type"] == "runnerup_verified"
|
|
assert data[today][0]["workout_data"]["after_sick_day"] == "true"
|
|
|
|
def test_runnerup_not_verified_returns_false(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""RunnerUp not verified → returns False."""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_phone_workout",
|
|
MagicMock(return_value=("no_phone", "no phone")),
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_runnerup_workout",
|
|
MagicMock(return_value=("not_verified", "no run")),
|
|
)
|
|
assert locker._try_auto_upgrade_sick_day() is False
|
|
|
|
|
|
class TestTryAutoUpgradeEarlyBirdRunnerUp:
|
|
"""Tests for RunnerUp paths in screen_lock.py _try_auto_upgrade_early_bird (305-318)."""
|
|
|
|
def test_runnerup_exception_returns_false(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""RuntimeError from _verify_runnerup_workout → returns False (lines 305-307)."""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_phone_workout",
|
|
MagicMock(return_value=("no_phone", "no phone")),
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_runnerup_workout",
|
|
MagicMock(side_effect=RuntimeError("adb gone")),
|
|
)
|
|
assert locker._try_auto_upgrade_early_bird() is False
|
|
|
|
def test_runnerup_verified_saves_entry(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""RunnerUp returns verified → saves runnerup_verified entry (lines 313-318)."""
|
|
log_file = tmp_path / "log.json"
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {}
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_phone_workout",
|
|
MagicMock(return_value=("no_phone", "no phone")),
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_runnerup_workout",
|
|
MagicMock(return_value=("verified", "Running: 6 km in 40 min")),
|
|
)
|
|
object.__setattr__(
|
|
locker, "_adjust_shutdown_time_later", MagicMock(return_value=True)
|
|
)
|
|
with patch("screen_locker._log_mixin.compute_entry_hmac", return_value=None):
|
|
result = locker._try_auto_upgrade_early_bird()
|
|
|
|
assert result is True
|
|
today = datetime.now(tz=UTC).strftime("%Y-%m-%d")
|
|
data = json.loads(log_file.read_text())
|
|
assert data[today][0]["workout_data"]["type"] == "runnerup_verified"
|
|
assert data[today][0]["workout_data"]["after_early_bird"] == "true"
|
|
|
|
def test_runnerup_not_verified_returns_false(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""RunnerUp not verified → returns False."""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_phone_workout",
|
|
MagicMock(return_value=("no_phone", "no phone")),
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_verify_runnerup_workout",
|
|
MagicMock(return_value=("not_verified", "no run")),
|
|
)
|
|
assert locker._try_auto_upgrade_early_bird() is False
|
|
|
|
|
|
class TestSyncNow:
|
|
"""Tests for sync_now, the public entry point behind ``--sync-only``."""
|
|
|
|
def test_runs_one_full_sync_pass(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""The timer unit's entry point must actually push and ingest.
|
|
|
|
``workout-sync.timer`` calls this headlessly; if it stopped delegating,
|
|
the timer would run and silently sync nothing.
|
|
"""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch(
|
|
"screen_locker._sync_mixin.pull_all_manual_records",
|
|
return_value=[("manual:x", {})],
|
|
),
|
|
patch("screen_locker._sync_mixin.push_pc_workouts") as push,
|
|
patch(
|
|
"screen_locker._sync_mixin.ingest_manual_records",
|
|
return_value=["manual:x"],
|
|
) as ingest,
|
|
):
|
|
locker.sync_now()
|
|
push.assert_called_once()
|
|
ingest.assert_called_once()
|