mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-10 19:27:14 +01:00
Krzysztof kuhy Rudnicki
38d66a8492
The periodic diet-guard-sync.timer paid a network round-trip every ~15 min to approximate the two moments the shared log actually changes on this device. Sync now fires on those events instead: * before a lock -- already present in _cli_gate._should_lock, which pulls only when a lock is otherwise due, so a phone-logged meal clears the lock and a not-due tick never touches the network; * after a meal is logged here -- new _sync_events.publish_after_log, wired into all three write paths (_cli_log, _cli_gate, _mcp). This is what stops the PHONE nagging for a slot already logged on the PC, the mirror image of the rule that keeps the phone's own tick unconditional. The gate's publish sits in cmd_gate AFTER MealGate.run() returns, never in the unlock handler: that runs on the Tk thread with the window still up, so a hanging network call would keep the user locked in behind a successful log. It also covers the "Synced from another device" unlock, which hooking log_meal would miss. Accepted trade: a PC that is on but neither logging nor locking no longer pulls, so an inbound phone edit lands at the next log or lock rather than within 15 min. Bounded by slot spacing -- an unlogged day raises a lock. install.sh now disables and removes the installed timer (guarded, since a fresh machine has no such unit and `disable` would abort under `set -euo pipefail`); the .service stays for manual one-off ticks. Every test that logs a meal would otherwise reach the network through the new call sites, so conftest patches publish_after_log at each of the three call sites -- not on _sync_events, so test_sync_events still exercises the real helper. Suite stays at ~8s, which is the actual leak detector. Two files had to be split to commit at all, since file-length passes filenames and both were already over the 250-line cap: _cli.py 466 -> 207, + _cli_args.py, _cli_init.py, _cli_log.py _mcp.py 370 -> 194, + _mcp_server.py (singleton + annotations), _mcp_read.py Their conftest/test patch targets moved in the same commit; a stale target redirects nothing and fails open. Verified: 701 python tests at 100% branch coverage, 555 flutter tests, `python -m diet_guard sync` -> 402 entries/exit 0, `gate --check` -> exit 0, all five MCP tools still register, live ~/.local/share/diet_guard byte-identical. Over-cap files: 44 -> 42. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RA9ynjqXPnexRQnR5oAuCC
55 lines
1.7 KiB
Python
55 lines
1.7 KiB
Python
"""Tests for the event-driven post-log sync trigger.
|
|
|
|
These exercise the real :func:`publish_after_log`, not the conftest stub: the
|
|
autouse fixture patches it at each *call site*, so importing it here still
|
|
reaches the genuine helper (see ``conftest._isolate_state``).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import patch
|
|
|
|
from diet_guard import _sync_events
|
|
from diet_guard._sync_events import publish_after_log
|
|
|
|
if TYPE_CHECKING:
|
|
import pytest
|
|
|
|
|
|
class TestPublishAfterLog:
|
|
"""A full tick fired by a local write, which must never raise."""
|
|
|
|
def test_success_returns_none(self) -> None:
|
|
"""A completed tick reports no reason."""
|
|
with patch.object(
|
|
_sync_events,
|
|
"pull_shared_log",
|
|
return_value=None,
|
|
) as pull:
|
|
assert publish_after_log() is None
|
|
pull.assert_called_once_with()
|
|
|
|
def test_outage_returns_reason(self) -> None:
|
|
"""A failed tick surfaces the reason instead of raising."""
|
|
with patch.object(
|
|
_sync_events,
|
|
"pull_shared_log",
|
|
return_value="sync unavailable (no token)",
|
|
):
|
|
assert publish_after_log() == "sync unavailable (no token)"
|
|
|
|
def test_outage_is_logged(self, caplog: pytest.LogCaptureFixture) -> None:
|
|
"""The reason reaches the log for callers with nowhere to show it."""
|
|
with (
|
|
patch.object(
|
|
_sync_events,
|
|
"pull_shared_log",
|
|
return_value="sync unavailable (boom)",
|
|
),
|
|
caplog.at_level(logging.INFO, logger="diet_guard._sync_events"),
|
|
):
|
|
publish_after_log()
|
|
assert "boom" in caplog.text
|