mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 13:27:39 +01:00
diet_guard pushed as "pc" (Python), "phone" (Android) and "desktop" (web). A role constant collides the moment a second machine takes the same role, and after a reinstall the new install inherits the previous one's CRDT identity -- the same reasoning home_inventory already records for choosing a uuid. Both halves now mint a uuid once and persist it: the PC in ~/.local/share/diet_guard/.device_id, the app under SharedPreferences 'crdt.nodeId' (the key todo and home_inventory already use). The old constant survives as the legacy id and is passed to sync_log / syncLog, so devices/<legacy>/ is skipped as this device's own. Without that every tick would re-download and re-merge this device's own pre-migration log as though a peer had written it -- idempotent under LWW, but hundreds of KB, 96 times a day. It drops to None once that path is reclaimed; a test covers both states, including a negative control proving the skip is the legacy id's doing. All four documents move together (food_log, food_bank, food_bank_manual, budget), and the hist:<date> fields riding on the budget record are untouched -- merge_record unions field names, so they relay through unchanged. The resolver lives in its own module (_device.py / sync_device_id.dart) because _sync_merge needs it for HLC stamping too and importing _sync there would be a cycle. Dart resolves it asynchronously at startup, before LogStorageService.init(); currentSyncDeviceId falls back to the compile-time role constant until then, so a too-early Hlc stamp gets a valid id rather than crashing. conftest redirects the new id file in the same change that introduces it -- without that a test mints a uuid into the real state dir and this machine's live sync identity is decided by whichever test ran first. Verified by checking ~/.local/share/diet_guard/ before and after: untouched. Verified live, not just against mocks: the sync timer ran mid-change and migrated this machine to f8f46da6. All 358 food_log records and all 100 food_bank records are present under the new path (0 missing vs devices/pc/), and the new log's HLCs carry only its own id -- confirming it did not re-merge the old path as a peer. Python: 687 tests, 100% branch coverage. App: 518 tests, analyzer clean. Pins bumped to crdt-sync-v0.6.0 / crdt_sync_dart-v0.7.0 (pyproject, requirements.txt, .pre-commit-config.yaml, pubspec), and the new library is installed into /usr/bin/python's user site-packages so the production timer does not ImportError on its next tick. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GZH89WEqAjuJT8WZdqc7AP
499 lines
19 KiB
Python
499 lines
19 KiB
Python
"""Tests for the cross-device sync orchestration.
|
|
|
|
The GitHub layer is mocked (no network access); conftest.py's
|
|
``_isolate_state``/``_hmac_key`` fixtures provide the rest of the isolation
|
|
(sync token path, food log path, a deterministic HMAC key).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from crdt_sync import ConfigError, GitHubSyncError, SyncState
|
|
import pytest
|
|
|
|
from diet_guard import _sync
|
|
from diet_guard._budget import budget_weight, daily_budget, write_budget
|
|
from diet_guard._budget_history import load_entries
|
|
from diet_guard._device import device_id, device_identity
|
|
from diet_guard._estimator import Nutrition
|
|
from diet_guard._foodbank import lookup_food
|
|
from diet_guard._state import load_log, log_meal
|
|
from diet_guard._sync_merge import (
|
|
budget_to_log,
|
|
)
|
|
|
|
|
|
def _remote_budget_json(*, kcal: int, t: str, weight_kg: float | None = None) -> str:
|
|
"""Build the wire text a remote device would push for a given budget edit."""
|
|
record: dict[str, object] = {"v": 2, "b": kcal, "t": t}
|
|
if weight_kg is not None:
|
|
record["w"] = weight_kg
|
|
log = budget_to_log(record)
|
|
return json.dumps({rid: rec.to_dict() for rid, rec in log.items()}, indent=2)
|
|
|
|
|
|
def _nutrition(kcal: float = 200.0) -> Nutrition:
|
|
return Nutrition(
|
|
kcal=kcal,
|
|
protein_g=10.0,
|
|
carbs_g=20.0,
|
|
fat_g=5.0,
|
|
grams=100.0,
|
|
source="manual",
|
|
)
|
|
|
|
|
|
def _write_token(token: str = "fake-token") -> None:
|
|
_sync.SYNC_TOKEN_FILE.parent.mkdir(parents=True, exist_ok=True)
|
|
_sync.SYNC_TOKEN_FILE.write_text(token)
|
|
|
|
|
|
def _mock_client(
|
|
*,
|
|
devices: tuple[str, ...] = (),
|
|
files: dict[str, str] | None = None,
|
|
) -> MagicMock:
|
|
"""Build a mock ``GitHubSyncClient`` covering the methods sync calls."""
|
|
client = MagicMock()
|
|
client.list_directory.return_value = list(devices)
|
|
resolved_files = files or {}
|
|
client.get_file_text.side_effect = resolved_files.get
|
|
# The real GitHubSyncClient has no bulk-map read, and a MagicMock would
|
|
# otherwise auto-create one returning a Mock -- which then fails to
|
|
# serialise. Deleting it also exercises the documented degrade path:
|
|
# no revision map means every peer is fetched, exactly as before.
|
|
del client.get_string_map
|
|
return client
|
|
|
|
|
|
class TestReadToken:
|
|
def test_missing_token_file_raises_sync_error(self) -> None:
|
|
with pytest.raises(_sync.SyncError):
|
|
_sync._read_token()
|
|
|
|
def test_empty_token_file_raises_sync_error(self) -> None:
|
|
_write_token(" ")
|
|
with pytest.raises(_sync.SyncError):
|
|
_sync._read_token()
|
|
|
|
def test_present_token_is_read_and_stripped(self) -> None:
|
|
_write_token(" abc123 \n")
|
|
assert _sync._read_token() == "abc123"
|
|
|
|
|
|
class TestRunSync:
|
|
def test_raises_before_touching_github_when_no_token(self) -> None:
|
|
with (
|
|
patch.object(_sync, "GitHubSyncClient") as client_cls,
|
|
pytest.raises(_sync.SyncError),
|
|
):
|
|
_sync.run_sync()
|
|
client_cls.assert_not_called()
|
|
|
|
def test_pushes_local_log_when_no_other_devices_have_synced(self) -> None:
|
|
_write_token()
|
|
log_meal("oatmeal", _nutrition(), slot=8)
|
|
client = _mock_client(devices=())
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
merged = _sync.run_sync()
|
|
|
|
assert sum(len(entries) for entries in merged.values()) == 1
|
|
pushed = [call.args[0] for call in client.put_file_text.call_args_list]
|
|
# The log push, the derived bank rebuilt from that same log, and this
|
|
# device's revision -- published *after* the log, so a peer can never
|
|
# cache "seen rev X" against a log it never received.
|
|
assert pushed == [
|
|
f"diet-guard-sync/devices/{device_id()}/food_bank.json",
|
|
f"diet-guard-sync/devices/{device_id()}/food_log.json",
|
|
f"diet-guard-sync/revs/{device_id()}",
|
|
]
|
|
log_call = next(
|
|
call
|
|
for call in client.put_file_text.call_args_list
|
|
if call.args[0].endswith("food_log.json")
|
|
)
|
|
pushed_json = log_call.args[1]
|
|
pushed = json.loads(pushed_json)
|
|
(record,) = pushed.values()
|
|
assert "fields" in record
|
|
assert "id" in record
|
|
|
|
def test_skips_its_own_device_id_when_listing(self) -> None:
|
|
_write_token()
|
|
client = _mock_client(
|
|
devices=("pc", "phone"),
|
|
files={"diet-guard-sync/devices/phone/food_log.json": "{}"},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
# Every pull -- food log, budget, curated bank -- skips "pc" (this
|
|
# device) and only ever reads "phone"'s files.
|
|
requested_paths = [call.args[0] for call in client.get_file_text.call_args_list]
|
|
assert requested_paths == [
|
|
"diet-guard-sync/devices/phone/food_log.json",
|
|
"diet-guard-sync/devices/phone/budget.json",
|
|
"diet-guard-sync/devices/phone/food_bank.json",
|
|
"diet-guard-sync/devices/phone/food_bank_manual.json",
|
|
]
|
|
|
|
def test_skips_a_device_with_no_pushed_file_yet(self) -> None:
|
|
_write_token()
|
|
client = _mock_client(devices=("phone",), files={})
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
merged = _sync.run_sync()
|
|
assert merged == {}
|
|
|
|
def test_ignores_a_device_whose_pushed_file_is_not_a_json_object(self) -> None:
|
|
_write_token()
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/food_log.json": "[]"},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
merged = _sync.run_sync()
|
|
assert merged == {}
|
|
|
|
def test_skips_a_device_whose_pushed_file_is_corrupt_json(self) -> None:
|
|
"""An interrupted/truncated push must not crash every other device's
|
|
merge -- it is treated the same as a device that hasn't pushed yet.
|
|
"""
|
|
_write_token()
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/food_log.json": "{not valid json"},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
merged = _sync.run_sync()
|
|
assert merged == {}
|
|
|
|
def test_merges_in_a_remote_devices_entries(self) -> None:
|
|
_write_token()
|
|
remote_log_json = json.dumps(
|
|
{
|
|
"2026-06-22": [
|
|
{
|
|
"id": "phone-1",
|
|
"time": "2026-06-22T09:00:00+02:00",
|
|
"desc": "phone meal",
|
|
"kcal": 400.0,
|
|
"protein_g": 20.0,
|
|
"carbs_g": 40.0,
|
|
"fat_g": 10.0,
|
|
"grams": 300.0,
|
|
"source": "manual",
|
|
},
|
|
],
|
|
},
|
|
)
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/food_log.json": remote_log_json},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
merged = _sync.run_sync()
|
|
descs = {entry["desc"] for entries in merged.values() for entry in entries}
|
|
assert "phone meal" in descs
|
|
|
|
def test_resigns_every_entry_so_an_unsigned_remote_entry_survives_reload(
|
|
self,
|
|
) -> None:
|
|
"""The data-loss trap: an unsigned phone-origin entry must not be
|
|
silently dropped by load_log() after sync persists it locally --
|
|
_entry_is_valid() rejects any unsigned entry once a key exists.
|
|
"""
|
|
_write_token()
|
|
remote_log_json = json.dumps(
|
|
{
|
|
"2026-06-22": [
|
|
{
|
|
"id": "phone-1",
|
|
"time": "2026-06-22T09:00:00+02:00",
|
|
"desc": "phone meal",
|
|
"kcal": 400.0,
|
|
"protein_g": 20.0,
|
|
"carbs_g": 40.0,
|
|
"fat_g": 10.0,
|
|
"grams": 300.0,
|
|
"source": "manual",
|
|
# No "hmac" -- the phone never holds the shared key.
|
|
},
|
|
],
|
|
},
|
|
)
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/food_log.json": remote_log_json},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
|
|
reloaded = load_log()
|
|
descs = {entry["desc"] for entries in reloaded.values() for entry in entries}
|
|
assert "phone meal" in descs
|
|
|
|
def test_rebuilds_the_food_bank_after_merge(self) -> None:
|
|
_write_token()
|
|
log_meal("oatmeal", _nutrition(), slot=8)
|
|
client = _mock_client(devices=())
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
assert lookup_food("oatmeal") is not None
|
|
|
|
|
|
class TestSyncBudget:
|
|
"""The daily budget's last-writer-wins sync, folded into run_sync()."""
|
|
|
|
def test_pushes_local_budget_when_no_other_devices_have_synced(self) -> None:
|
|
_write_token()
|
|
write_budget(2000)
|
|
client = _mock_client(devices=())
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
pushed_paths = {call.args[0] for call in client.put_file_text.call_args_list}
|
|
assert f"diet-guard-sync/devices/{device_id()}/budget.json" in pushed_paths
|
|
|
|
def test_nothing_pushed_when_no_budget_ever_set(self) -> None:
|
|
"""An uninitialized device contributes nothing -- no push, no crash."""
|
|
_write_token()
|
|
client = _mock_client(devices=())
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
pushed_paths = {call.args[0] for call in client.put_file_text.call_args_list}
|
|
assert f"diet-guard-sync/devices/{device_id()}/budget.json" not in pushed_paths
|
|
|
|
def test_remote_only_budget_is_adopted_locally(self) -> None:
|
|
"""Only the phone has ever set a budget -- the PC adopts it."""
|
|
_write_token()
|
|
remote_json = _remote_budget_json(kcal=1800, t="2026-01-01T09:00:00")
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/budget.json": remote_json},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
assert daily_budget() == 1800
|
|
|
|
def test_local_edit_later_than_remote_wins(self) -> None:
|
|
"""A fresh local write beats a much older remote edit."""
|
|
_write_token()
|
|
write_budget(1500) # stamped with "now"
|
|
remote_json = _remote_budget_json(kcal=1800, t="2020-01-01T09:00:00")
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/budget.json": remote_json},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
assert daily_budget() == 1500
|
|
|
|
def test_remote_edit_later_than_local_wins(self) -> None:
|
|
"""A remote edit far in the future beats a stale local write.
|
|
|
|
Confirms this is genuinely edit-time (not sync-time or push-order)
|
|
LWW: whichever side has the later ``t`` wins regardless of which
|
|
device happens to run its sync tick first.
|
|
"""
|
|
_write_token()
|
|
write_budget(1500) # stamped with "now"
|
|
remote_json = _remote_budget_json(kcal=1800, t="2999-01-01T09:00:00")
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/budget.json": remote_json},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
assert daily_budget() == 1800
|
|
|
|
def test_a_remote_edit_does_not_delete_the_local_body_weight(self) -> None:
|
|
"""The w-loss bug: ``w`` is PC-local and must survive a phone edit.
|
|
|
|
``w`` never travels (budget_to_log strips it), so before this fix a
|
|
winning remote record replaced the whole stored map and silently took
|
|
the weight -- and the protein target -- with it.
|
|
"""
|
|
_write_token()
|
|
write_budget(1500, weight_kg=78.5)
|
|
remote_json = _remote_budget_json(kcal=1800, t="2999-01-01T09:00:00")
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/budget.json": remote_json},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
assert daily_budget() == 1800
|
|
assert budget_weight() == 78.5
|
|
|
|
def test_budget_history_survives_a_round_trip(self) -> None:
|
|
"""The history is written back locally after every merge."""
|
|
_write_token()
|
|
write_budget(2000)
|
|
client = _mock_client(devices=())
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
assert load_entries()[-1].kcal == 2000
|
|
|
|
def test_malformed_remote_budget_is_skipped(self) -> None:
|
|
"""A corrupt remote budget.json is skipped, not a crash."""
|
|
_write_token()
|
|
write_budget(2000)
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/budget.json": "{not valid json"},
|
|
)
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
assert daily_budget() == 2000
|
|
|
|
|
|
class TestPullSharedLog:
|
|
"""The fail-closed wrapper the gate and the lock-screen button share."""
|
|
|
|
def test_returns_none_on_success(self) -> None:
|
|
"""A clean pull returns None (no reason to report)."""
|
|
with patch.object(_sync, "run_sync") as run_sync:
|
|
assert _sync.pull_shared_log() is None
|
|
run_sync.assert_called_once_with()
|
|
|
|
def test_returns_reason_on_expected_failure(self) -> None:
|
|
"""A real sync failure (here a network error) becomes a reason string."""
|
|
with patch.object(_sync, "run_sync", side_effect=_sync.GitHubSyncError("boom")):
|
|
reason = _sync.pull_shared_log()
|
|
assert reason is not None
|
|
assert "boom" in reason
|
|
|
|
def test_unexpected_error_is_not_swallowed(self) -> None:
|
|
"""A bug outside the known failure surface surfaces, not hidden."""
|
|
with (
|
|
patch.object(_sync, "run_sync", side_effect=KeyError("bug")),
|
|
pytest.raises(KeyError),
|
|
):
|
|
_sync.pull_shared_log()
|
|
|
|
|
|
class TestRemoteClient:
|
|
"""Which backend a sync tick runs against during the cutover."""
|
|
|
|
def test_stays_on_github_without_firebase_config(
|
|
self, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""An unconfigured machine must not reach the network at all."""
|
|
monkeypatch.setattr(_sync, "CONFIG_FILE", Path("/nonexistent/firebase.json"))
|
|
github = object()
|
|
|
|
assert _sync._remote_client(github) is github
|
|
|
|
def test_mirrors_to_github_when_configured(
|
|
self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""Configured: Firebase is primary, GitHub keeps receiving writes."""
|
|
config = tmp_path / "firebase.json"
|
|
config.write_text("{}", encoding="utf-8")
|
|
monkeypatch.setattr(_sync, "CONFIG_FILE", config)
|
|
monkeypatch.setattr(
|
|
_sync, "mirror_client_for", lambda _app, client: ("mirror", client)
|
|
)
|
|
github = object()
|
|
|
|
assert _sync._remote_client(github) == ("mirror", github)
|
|
|
|
def test_falls_back_when_firebase_is_unusable(
|
|
self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""A broken Firebase must degrade to GitHub, never fail the tick."""
|
|
config = tmp_path / "firebase.json"
|
|
config.write_text("{}", encoding="utf-8")
|
|
monkeypatch.setattr(_sync, "CONFIG_FILE", config)
|
|
|
|
def _boom(*_args: object, **_kwargs: object) -> None:
|
|
message = "no password"
|
|
raise ConfigError(message)
|
|
|
|
monkeypatch.setattr(_sync, "mirror_client_for", _boom)
|
|
github = object()
|
|
|
|
assert _sync._remote_client(github) is github
|
|
|
|
|
|
class TestRemoteRevisions:
|
|
"""Reading the peers' revision map, which gates the big downloads."""
|
|
|
|
def test_is_empty_without_a_bulk_map_read(self) -> None:
|
|
"""GitHub has none; correctness must not depend on the optimisation."""
|
|
client = MagicMock()
|
|
del client.get_string_map
|
|
|
|
assert _sync._remote_revisions(client) == {}
|
|
|
|
def test_returns_the_published_revisions(self) -> None:
|
|
client = MagicMock()
|
|
client.get_string_map.return_value = {"phone": "abc"}
|
|
|
|
assert _sync._remote_revisions(client) == {"phone": "abc"}
|
|
|
|
def test_an_unreadable_map_degrades_to_fetching_everything(self) -> None:
|
|
"""Not worth failing a sync over; every peer is simply fetched."""
|
|
client = MagicMock()
|
|
client.get_string_map.side_effect = GitHubSyncError("boom")
|
|
|
|
assert _sync._remote_revisions(client) == {}
|
|
|
|
|
|
class TestPullSkipsUnchangedPeers:
|
|
"""The single largest traffic saving in the fleet."""
|
|
|
|
def test_skips_a_peer_whose_revision_is_unchanged(self) -> None:
|
|
client = _mock_client(devices=("phone",))
|
|
state = SyncState(pushed_rev=None, peer_revs={"phone": "rev-1"})
|
|
seen: dict[str, str] = {}
|
|
|
|
logs = _sync._pull_remote_logs(
|
|
client, {"phone": "rev-1"}, state, seen, device_identity()
|
|
)
|
|
|
|
assert logs == []
|
|
assert seen == {"phone": "rev-1"}
|
|
client.get_file_text.assert_not_called()
|
|
|
|
def test_downloads_a_peer_whose_revision_moved(self) -> None:
|
|
text = json.dumps({})
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"diet-guard-sync/devices/phone/food_log.json": text},
|
|
)
|
|
state = SyncState(pushed_rev=None, peer_revs={"phone": "rev-1"})
|
|
seen: dict[str, str] = {}
|
|
|
|
_sync._pull_remote_logs(
|
|
client, {"phone": "rev-2"}, state, seen, device_identity()
|
|
)
|
|
|
|
client.get_file_text.assert_called_once()
|
|
assert seen == {"phone": "rev-2"}
|
|
|
|
|
|
class TestNoOpPushSuppression:
|
|
"""88% of the old GitHub history was byte-identical no-op pushes."""
|
|
|
|
def test_a_second_unchanged_sync_pushes_no_log(self) -> None:
|
|
"""The saving the free-tier budget depends on, at 96 ticks a day."""
|
|
_write_token()
|
|
client = _mock_client()
|
|
|
|
with patch.object(_sync, "GitHubSyncClient", return_value=client):
|
|
_sync.run_sync()
|
|
pushed_first = [
|
|
call.args[0] for call in client.put_file_text.call_args_list
|
|
]
|
|
client.put_file_text.reset_mock()
|
|
_sync.run_sync()
|
|
|
|
pushed_second = [call.args[0] for call in client.put_file_text.call_args_list]
|
|
assert f"diet-guard-sync/devices/{device_id()}/food_log.json" in pushed_first
|
|
assert (
|
|
f"diet-guard-sync/devices/{device_id()}/food_log.json" not in pushed_second
|
|
)
|
|
assert f"diet-guard-sync/revs/{device_id()}" not in pushed_second
|