mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-11 14:27:40 +01:00
Krzysztof kuhy Rudnicki
9b84af7537
Three faults that together locked kuhy out on 2026-09-18 with a workout
on disk and "Manual-workout budget exhausted" on the screen.
1. The football logged at 00:02 on 2026-09-13 was rekeyed to its local
day (keeping workout_id manual:2026-09-12T14:30), published, and pulled
straight back by the 09:40 tick as a new record: _already_ingested only
matched sync_record_id (which a locally logged entry never carries) and
the chokepoint re-derived the id from the corrected date, so the same
workout landed twice. Ingest now files a synced manual under the wire
id it arrived with and recognises an entry whose own workout_id is that
record.
2. count_in_window counted raw manual_workout entries, so the twin took a
second budget slot for a week (2/2) while the weekly count, which goes
through credit_key, saw one. The budget now shares credit_key -- the
rule the docstring says every counter must share -- and distinct
workouts on one day still cost a slot each.
3. _check_today_state_exits returned False (full lock) from the expired
early-bird branch before ever consulting has_logged_today, so a manual
walk entered on the lock screen at 09:32 held for exactly one tick: the
09:35 run locked again ("also=workout_logged_today"), and kept doing so
every 5 minutes while the day's marker lasted, which is how a sick day
got spent over a logged workout. The explain chain already treated the
expired marker as non-terminal; the live ladder now falls through the
same way.
_manual_sync.py went over the 250-line cap and is split: draft
reconstruction lives in _manual_sync_draft.py, re-exported from the
original path so patch targets are unchanged.
Replayed on the real log: count_day_credits("2026-09-13") == 1 while the
old count_in_window said 2; after the fix the status API reports
used_7d=1, exhausted=False. test_manual_rekey_dedup.py fails 3/4 on HEAD.
1334 tests, 100% coverage.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
241 lines
9.1 KiB
Python
241 lines
9.1 KiB
Python
"""Tests for _check_today_state_exits and scheduled-skip branches."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from screen_locker.tests.conftest import create_locker, create_locker_relaxed_day
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
from screen_locker.screen_lock import ScreenLocker
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _check_today_state_exits: return True/False branches
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestCheckTodayStateExits:
|
|
"""Cover all return True/False paths in _check_today_state_exits.
|
|
|
|
sys.exit is mocked without side_effect so execution continues past it
|
|
and the 'return True' statements are reachable.
|
|
"""
|
|
|
|
def _make_locker(self, mock_tk: MagicMock, tmp_path: Path) -> ScreenLocker:
|
|
return create_locker(mock_tk, tmp_path)
|
|
|
|
def test_early_bird_upgrade_success_returns_true(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Early bird upgrade success returns true."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=True),
|
|
patch.object(locker, "_is_early_bird_time", return_value=False),
|
|
patch.object(locker, "_try_auto_upgrade_early_bird", return_value=True),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is True
|
|
|
|
def test_early_bird_upgrade_fail_returns_false(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Early bird upgrade fail returns false."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=True),
|
|
patch.object(locker, "_is_early_bird_time", return_value=False),
|
|
patch.object(locker, "_try_auto_upgrade_early_bird", return_value=False),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is False
|
|
|
|
def test_expired_early_bird_does_not_outrank_a_logged_workout(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""2026-09-18: a manual walk logged at 09:32 must hold after 08:30.
|
|
|
|
The expired-marker branch used to return False (full lock) before
|
|
``has_logged_today`` was ever consulted, so every 5-minute tick after
|
|
the walk re-locked the PC for the rest of the day.
|
|
"""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=True),
|
|
patch.object(locker, "_is_early_bird_time", return_value=False),
|
|
patch.object(locker, "_try_auto_upgrade_early_bird", return_value=False),
|
|
patch.object(locker, "has_logged_today", return_value=True),
|
|
patch("screen_locker._auto_upgrade.record_decision") as record,
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is True
|
|
assert record.call_args.args[0].reason == "workout_logged_today"
|
|
|
|
def test_early_bird_window_active_returns_true(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Early bird window active returns true."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=True),
|
|
patch.object(locker, "_is_early_bird_time", return_value=True),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is True
|
|
|
|
def test_sick_day_auto_upgrade_returns_true(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Sick day auto upgrade returns true."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=False),
|
|
patch.object(locker, "_is_sick_day_today", return_value=True),
|
|
patch.object(locker, "_try_auto_upgrade_sick_day", return_value=True),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is True
|
|
|
|
def test_sick_day_no_upgrade_still_returns_true(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""A sick day already marked today halts startup even when no real
|
|
workout is found to upgrade it - sick_day no longer lives in
|
|
log.json, so this halt must be explicit (see
|
|
_auto_upgrade.py's _check_today_state_exits), not an accidental
|
|
side effect of has_logged_today() catching a leftover log entry."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=False),
|
|
patch.object(locker, "_is_sick_day_today", return_value=True),
|
|
patch.object(locker, "_try_auto_upgrade_sick_day", return_value=False),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is True
|
|
|
|
def test_workout_skip_today_returns_true(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Workout skip today returns true."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=False),
|
|
patch.object(locker, "_is_sick_day_today", return_value=False),
|
|
patch.object(locker, "has_logged_today", return_value=False),
|
|
patch(
|
|
"screen_locker._auto_upgrade.has_workout_skip_today",
|
|
return_value=True,
|
|
),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is True
|
|
|
|
def test_early_bird_time_returns_true(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Early bird time returns true."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=False),
|
|
patch.object(locker, "_is_sick_day_today", return_value=False),
|
|
patch.object(locker, "has_logged_today", return_value=False),
|
|
patch(
|
|
"screen_locker._auto_upgrade.has_workout_skip_today",
|
|
return_value=False,
|
|
),
|
|
patch.object(locker, "_is_early_bird_time", return_value=True),
|
|
patch.object(locker, "_save_early_bird_pending"),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is True
|
|
|
|
def test_no_exit_conditions_returns_false(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""No exit conditions returns false."""
|
|
locker = self._make_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(locker, "_is_early_bird_pending", return_value=False),
|
|
patch.object(locker, "_is_sick_day_today", return_value=False),
|
|
patch.object(locker, "has_logged_today", return_value=False),
|
|
patch(
|
|
"screen_locker._auto_upgrade.has_workout_skip_today",
|
|
return_value=False,
|
|
),
|
|
patch.object(locker, "_is_early_bird_time", return_value=False),
|
|
):
|
|
result = locker._check_today_state_exits()
|
|
assert result is False
|
|
|
|
|
|
class TestCheckNonVerifyExitsScheduledSkip:
|
|
"""Cover the return after scheduled-skip sys.exit in _check_non_verify_exits."""
|
|
|
|
def test_scheduled_skip_return_reached(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Scheduled skip return reached."""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
with patch.object(locker, "_is_scheduled_skip_today", return_value=True):
|
|
locker._check_non_verify_exits()
|
|
mock_sys_exit.assert_called_once_with(0)
|
|
|
|
|
|
class TestRelaxedDayCloseAndRun:
|
|
"""No LockWindow is built on a relaxed day; close()/run() use root."""
|
|
|
|
def test_relaxed_day_close_and_run_use_root_directly(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Relaxed day close and run use root directly."""
|
|
locker = create_locker_relaxed_day(mock_tk, tmp_path)
|
|
assert locker._lock is None
|
|
|
|
locker.run()
|
|
locker.root.mainloop.assert_called_once()
|
|
|
|
locker.close()
|
|
locker.root.destroy.assert_called_once()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _check_non_verify_exits: heat-skip branch (reached after weekly minimum
|
|
# is not met — the only remaining same-day skip is genuine extreme heat)
|
|
# ---------------------------------------------------------------------------
|