mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-11 17:33:56 +01:00
Krzysztof kuhy Rudnicki
b0d9165a79
The morning routine is started by systemd right after boot and right after
resume, so its sync ran seconds before DHCP/DNS were up. Every such run failed
outright — and said this:
Workout sync push FAILED for 6 workout(s): network error reading
screen-locker-sync/devices — a 403 here means the token lacks
contents:write on kuhyx/syncs
Both halves of that were wrong. It was not a 403, and the token was fine: the
same six workouts pushed successfully by hand minutes later on the same token,
which reports push=true on the repo. The message cost a real investigation
chasing a permissions bug that did not exist.
- _sync_retry.with_sync_retry wraps the three sync call sites in a bounded
retry (4 attempts, 2s/4s/8s backoff — ~14s, enough for the network to come
up, short enough not to drag the routine). Verified offline in a network
namespace: three retries, then an honest give-up.
- Any GitHubSyncError retries, deliberately including RepoNotFoundError.
Classifying transient vs permanent would couple us to which exception
crdt_sync chains where; a few wasted seconds on a genuinely bad token is the
cheaper mistake.
- The push failure log now reports what actually happened. The contents:write
hint survives only for RepoNotFoundError, which is the one error that
actually implicates the repo or the token.
Retry at the application layer rather than ordering the unit after
network-online.target: the same race hits on resume, where boot ordering does
not apply, and these are user units that cannot depend on a system target.
The tests' autouse no-sleep fixture patches the module-local `sleep` name
rather than `_sync_retry.time.sleep` — the latter mutates the shared time
module object and silently disabled sleep for the whole suite, breaking an
unrelated temperature timeout test.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
50 lines
1.7 KiB
Python
50 lines
1.7 KiB
Python
"""Isolation fixture for the phone-workout GitHub sync token.
|
|
|
|
Split out of ``conftest.py`` (already at the repo's 400-line-per-file cap)
|
|
and re-exported there so pytest still picks this up as an autouse fixture
|
|
for every test in this directory.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Iterator
|
|
from pathlib import Path
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def isolate_sync_token(tmp_path: Path) -> Iterator[None]:
|
|
"""Redirect SYNC_TOKEN_FILE to tmp_path so tests never see a real token.
|
|
|
|
Without this, any test calling ``_verify_phone_workout`` would fall
|
|
through to ``pull_synced_workout()``, which -- if a real
|
|
``~/.config/screen_locker/sync_token`` happens to exist on the host --
|
|
would make a real GitHub API call. Defaulting to a nonexistent tmp_path
|
|
file makes ``read_sync_token()`` return None, the same benign "sync not
|
|
configured" state every existing test already assumes.
|
|
"""
|
|
with patch(
|
|
"screen_locker._workout_sync.SYNC_TOKEN_FILE",
|
|
tmp_path / "sync_token",
|
|
):
|
|
yield
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def no_sync_retry_sleep() -> Iterator[None]:
|
|
"""Make the sync retry's backoff instant for every test.
|
|
|
|
``with_sync_retry`` waits 2s + 4s + 8s before giving up, which is right in
|
|
production (it covers the network coming up after boot/resume) but would
|
|
add ~14s to every test that exercises a sync failure. Tests that care about
|
|
the backoff assert on the patched ``sleep`` calls instead -- see
|
|
``test_sync_retry.py``.
|
|
"""
|
|
with patch("screen_locker._sync_retry.sleep"):
|
|
yield
|