mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:07:16 +01:00
Krzysztof kuhy Rudnicki
79879263ba
The workout log stored ONE workout per calendar day, so a second same-day
workout was silently dropped and could never earn credit.
Multiple workouts per day:
- workout_log.json: {date: entry} -> {date: [entry, ...]}. Legacy entries are
wrapped on read (_log_io.load_workout_log) so their HMACs stay valid — no
re-signing; every write normalizes the file, migrating it progressively.
- New write chokepoint (_log_mixin.write_signed_entry) APPENDS and dedups by a
stable workout_id, returning RecordResult so callers can tell a new workout
from a duplicate. Re-verifying the same workout is a no-op.
- count_weekly_workouts is anti-gaming: each VERIFIED workout counts
individually; self-reported manual entries count at most once per day. Four
real workouts in one day satisfy the week; four manual entries count as one.
- Reward: the day's first counted workout gets the base +2h; an additional
same-day VERIFIED workout gets +1h; an additional manual gets nothing. The
old "+1h when weekly_count > 4" gate is replaced — weekly volume is the
banked bonus's job and shouldn't be paid twice.
- Fixed: the unlock screen labelled the +1h "#{weekly_count - 4}", which can
render negative under the new rule. Removed the dead runnerup_manual type.
- Flutter: the manual budget counts distinct DAYS, matching the PC.
PC->phone sync (it had never worked once):
- push_pc_manuals pushed from a side-store written at log-time, so anything
logged before that feature existed could never publish. _manual_push now
derives the crdt log directly from workout_log.json — the single source of
truth — covering manual AND verified runs. The record id is the workout's own
workout_id (derived for legacy entries to match the phone's format) and the
HLC comes from the entry's own timestamp, so a re-push is byte-identical and
the repo never churns.
- The phone reads every kind (readMergedWorkoutPayloads) and lists the PC's
workouts under "SYNCED FROM PC". The manual budget still sees manual-only, so
a verified run can't consume a self-report slot.
- Settings claimed "Connected." whenever a token STRING existed. It now
verifies against the API on open, so a revoked token reports 401 instead of
showing a green lie.
Never fail silently:
- 30 swallowed exceptions across 19 files now log WARNING with the concrete
cause AND consequence — plus the token guards in _workout_sync that returned
[] in total silence, the exact bug that hid the dead sync for weeks.
- New pre-commit hook (scripts/check_silent_failures.py) fails any except that
neither re-raises nor logs loudly. ruff's S110 only catches `except: pass`;
the real pattern here was `except: log.info(); return []`. Documented in
CLAUDE.md.
Verified on real data: the Jul 13 run (pulled from its actual TCX over ADB) now
counts alongside that day's manual squash, and all three workouts are published
to kuhyx/syncs.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Fv8ULVt3Q67GwCFbM7doHB
344 lines
11 KiB
Python
344 lines
11 KiB
Python
"""Tests for screen_locker initialization, logging, and basic operations."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import datetime, timezone
|
|
import json
|
|
import tkinter as tk
|
|
from typing import TYPE_CHECKING, Any
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from screen_locker.screen_lock import _assert_not_under_pytest
|
|
from screen_locker.tests.conftest import create_locker
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
class TestAssertNotUnderPytest:
|
|
"""Tests for the _assert_not_under_pytest runtime guard."""
|
|
|
|
def test_raises_when_tk_is_real(self) -> None:
|
|
"""Guard fires if tk.Tk is the real tkinter class under pytest."""
|
|
with (
|
|
patch("screen_locker.screen_lock.tk", tk),
|
|
pytest.raises(RuntimeError, match="SAFETY"),
|
|
):
|
|
_assert_not_under_pytest()
|
|
|
|
def test_silent_when_tk_is_mocked(self) -> None:
|
|
"""Guard stays silent when tk is already mocked (normal test run)."""
|
|
_assert_not_under_pytest()
|
|
|
|
|
|
class TestScreenLockerInit:
|
|
"""Tests for ScreenLocker initialization."""
|
|
|
|
def test_init_demo_mode(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""Test initialization in demo mode."""
|
|
locker = create_locker(mock_tk, tmp_path, demo_mode=True)
|
|
|
|
assert locker.demo_mode is True
|
|
assert locker.lockout_time == 10
|
|
mock_sys_exit.assert_not_called()
|
|
|
|
def test_init_production_mode(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""Test initialization in production mode."""
|
|
locker = create_locker(mock_tk, tmp_path, demo_mode=False)
|
|
|
|
assert locker.demo_mode is False
|
|
assert locker.lockout_time == 1800
|
|
mock_sys_exit.assert_not_called()
|
|
|
|
def test_init_exits_if_logged_today(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""Test that init exits early if workout logged today."""
|
|
mock_sys_exit.side_effect = SystemExit(0)
|
|
|
|
with pytest.raises(SystemExit):
|
|
create_locker(mock_tk, tmp_path, has_logged=True)
|
|
|
|
mock_sys_exit.assert_called_once_with(0)
|
|
|
|
|
|
class TestHasLoggedToday:
|
|
"""Tests for has_logged_today method."""
|
|
|
|
def test_no_log_file(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test when log file doesn't exist."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
|
|
locker.log_file = log_file
|
|
assert locker.has_logged_today() is False
|
|
|
|
def test_empty_log_file(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test when log file is empty/invalid JSON."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
log_file.write_text("")
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
assert locker.has_logged_today() is False
|
|
|
|
def test_invalid_json(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test when log file contains invalid JSON."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
log_file.write_text("{invalid json}")
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
assert locker.has_logged_today() is False
|
|
|
|
def test_today_logged(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test when today's workout is logged with valid HMAC."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
log_file.write_text(
|
|
json.dumps({today: {"workout": "data", "hmac": "valid"}}),
|
|
)
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
with patch(
|
|
"screen_locker._compliance_state.verify_entry_hmac",
|
|
return_value=True,
|
|
):
|
|
assert locker.has_logged_today() is True
|
|
|
|
def test_today_logged_invalid_hmac(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test rejects entry when HMAC verification fails."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
log_file.write_text(
|
|
json.dumps({today: {"workout": "data", "hmac": "tampered"}}),
|
|
)
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
with patch(
|
|
"screen_locker._compliance_state.verify_entry_hmac",
|
|
return_value=False,
|
|
):
|
|
assert locker.has_logged_today() is False
|
|
|
|
def test_today_unsigned_entry_no_hmac_key(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Accept unsigned entry when HMAC key is unavailable."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
log_file.write_text(
|
|
json.dumps({today: {"workout": "data"}}),
|
|
)
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
with (
|
|
patch(
|
|
"screen_locker._compliance_state.verify_entry_hmac",
|
|
return_value=False,
|
|
),
|
|
patch(
|
|
"screen_locker._compliance_state.compute_entry_hmac",
|
|
return_value=None,
|
|
),
|
|
):
|
|
assert locker.has_logged_today() is True
|
|
|
|
def test_today_unsigned_entry_with_hmac_key(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Reject unsigned entry when HMAC key IS available."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
log_file.write_text(
|
|
json.dumps({today: {"workout": "data"}}),
|
|
)
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
with (
|
|
patch(
|
|
"screen_locker._compliance_state.verify_entry_hmac",
|
|
return_value=False,
|
|
),
|
|
patch(
|
|
"screen_locker._compliance_state.compute_entry_hmac",
|
|
return_value="some-signature",
|
|
),
|
|
):
|
|
assert locker.has_logged_today() is False
|
|
|
|
def test_other_day_logged(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test when only other days are logged."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
log_file.write_text(json.dumps({"2020-01-01": {"workout": "data"}}))
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
assert locker.has_logged_today() is False
|
|
|
|
|
|
class TestSaveWorkoutLog:
|
|
"""Tests for save_workout_log method."""
|
|
|
|
def test_save_to_new_file(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test saving to a new log file includes HMAC."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {"type": "running"}
|
|
with patch(
|
|
"screen_locker._log_mixin.compute_entry_hmac",
|
|
return_value="abc123",
|
|
):
|
|
locker.save_workout_log()
|
|
|
|
assert log_file.exists()
|
|
with log_file.open() as f:
|
|
data: dict[str, Any] = json.load(f)
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
assert today in data
|
|
# The log now holds a list of entries per day (multiple workouts/day).
|
|
assert data[today][0]["workout_data"]["type"] == "running"
|
|
assert data[today][0]["hmac"] == "abc123"
|
|
|
|
def test_save_to_new_file_no_hmac_key(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test saving without HMAC key produces unsigned entry."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {"type": "running"}
|
|
with patch(
|
|
"screen_locker._log_mixin.compute_entry_hmac",
|
|
return_value=None,
|
|
):
|
|
locker.save_workout_log()
|
|
|
|
with log_file.open() as f:
|
|
data: dict[str, Any] = json.load(f)
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
assert "hmac" not in data[today][0]
|
|
|
|
def test_save_to_existing_file(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test saving appends to existing log file."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
log_file.write_text(json.dumps({"2020-01-01": {"old": "data"}}))
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {"type": "strength"}
|
|
with patch(
|
|
"screen_locker._log_mixin.compute_entry_hmac",
|
|
return_value="sig",
|
|
):
|
|
locker.save_workout_log()
|
|
|
|
with log_file.open() as f:
|
|
data: dict[str, Any] = json.load(f)
|
|
assert "2020-01-01" in data
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
assert today in data
|
|
|
|
def test_save_with_corrupted_existing_file(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test saving when existing file is corrupted."""
|
|
log_file = tmp_path / "workout_log.json"
|
|
log_file.write_text("not valid json")
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {"type": "running"}
|
|
with patch(
|
|
"screen_locker._log_mixin.compute_entry_hmac",
|
|
return_value="sig",
|
|
):
|
|
locker.save_workout_log()
|
|
|
|
with log_file.open() as f:
|
|
data: dict[str, Any] = json.load(f)
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
assert today in data
|
|
|
|
def test_save_with_write_error(
|
|
self,
|
|
mock_tk: MagicMock,
|
|
mock_sys_exit: MagicMock,
|
|
tmp_path: Path,
|
|
) -> None:
|
|
"""Test saving handles write errors gracefully."""
|
|
log_file = tmp_path / "nonexistent_dir" / "workout_log.json"
|
|
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.log_file = log_file
|
|
locker.workout_data = {"type": "running"}
|
|
with patch(
|
|
"screen_locker._log_mixin.compute_entry_hmac",
|
|
return_value="sig",
|
|
):
|
|
# Should not raise, just log warning
|
|
locker.save_workout_log()
|