mirror of
https://github.com/kuhyx/utils.git
synced 2026-11-10 22:27:13 +01:00
Krzysztof kuhy Rudnicki
6154dc09bf
The three Python packages pinned ruff twice at different versions: requirements.txt at 0.16.7, .pre-commit-config.yaml at v0.15.2. Only the older one ever ran, so `select = ["ALL"]` was enforced two minor versions behind. Measured before aligning: v0.15.2 reports 0 findings, every 0.16.x reports CPY001 on each file -- 70 crdt-sync, 23 freedays, 71 gatelock, and no other rule. Resolved by adding the notice rather than ignoring the rule, so the gate keeps its teeth. Two gatelock modules sat at exactly the 250-line cap, so a one-line header tipped them to 251. Both are split along a real seam rather than shaved: _widget_fills.py colour arithmetic over LockConfig, no tkinter import _surfaces_focus.py selects among existing surfaces, never mutates them The focus split keeps _surfaces.py's documented containment (it stays the only module that creates, moves or destroys windows), and the static guard in test_recovery_invariants.py globs _surfaces*.py, so the new sibling is covered with no list to extend. widgets.py re-exports the fills helpers, which keeps gatelock.widgets the single public surface its tests import. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019kMvSMtsVMB3d2uoZ56pbp
131 lines
3.6 KiB
Python
131 lines
3.6 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki
|
|
"""Tests for the peer files sync_log declines to merge.
|
|
|
|
Split from ``test_sync.py`` (250-line cap). A peer whose pushed file is
|
|
missing, corrupt or the wrong shape must be skipped rather than allowed to
|
|
fail the whole sync; these cover each of those, plus skipping our own device.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import MagicMock
|
|
|
|
from crdt_sync import (
|
|
GitHubSyncClient,
|
|
LogCodec,
|
|
Record,
|
|
SyncTarget,
|
|
sync_log,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
import pytest
|
|
|
|
from crdt_sync import Log
|
|
|
|
|
|
def _encode(log: Log) -> str:
|
|
return json.dumps(
|
|
{record_id: record.to_dict() for record_id, record in log.items()}
|
|
)
|
|
|
|
|
|
def _decode(text: str) -> Log:
|
|
return {
|
|
record_id: Record.from_dict(data)
|
|
for record_id, data in json.loads(text).items()
|
|
}
|
|
|
|
|
|
def _mock_client(
|
|
*,
|
|
devices: tuple[str, ...] = (),
|
|
files: dict[str, str] | None = None,
|
|
) -> MagicMock:
|
|
"""Build a mock ``GitHubSyncClient`` covering the methods sync_log calls."""
|
|
client = MagicMock(spec=GitHubSyncClient)
|
|
client.list_directory.return_value = list(devices)
|
|
resolved_files = files or {}
|
|
client.get_file_text.side_effect = resolved_files.get
|
|
return client
|
|
|
|
|
|
class TestSyncLogSkips:
|
|
"""Peer files that must be passed over rather than merged."""
|
|
|
|
def test_skips_a_device_with_no_pushed_file_yet(self) -> None:
|
|
"""Skips a device with no pushed file yet."""
|
|
client = _mock_client(devices=("phone",), files={})
|
|
|
|
merged = sync_log(
|
|
SyncTarget(
|
|
client=client,
|
|
device_id="pc",
|
|
path_prefix="devices",
|
|
),
|
|
{},
|
|
LogCodec(
|
|
decode=_decode,
|
|
encode=_encode,
|
|
),
|
|
)
|
|
|
|
assert not merged
|
|
|
|
def test_skips_a_device_whose_pushed_file_is_corrupt(
|
|
self, caplog: pytest.LogCaptureFixture
|
|
) -> 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.
|
|
"""
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"devices/phone/log.json": "{not valid json"},
|
|
)
|
|
|
|
with caplog.at_level(logging.WARNING):
|
|
merged = sync_log(
|
|
SyncTarget(
|
|
client=client,
|
|
device_id="pc",
|
|
path_prefix="devices",
|
|
),
|
|
{},
|
|
LogCodec(
|
|
decode=_decode,
|
|
encode=_encode,
|
|
),
|
|
)
|
|
|
|
assert not merged
|
|
assert "Unparsable log" in caplog.text
|
|
|
|
def test_skips_a_device_whose_pushed_json_has_the_wrong_shape(self) -> None:
|
|
"""Valid JSON that isn't a record map (e.g. from an incompatible
|
|
writer) must be skipped like corrupt JSON, not crash the whole
|
|
sync -- this is what the broad ``(ValueError, KeyError, TypeError)``
|
|
catch in ``_pull_remote_logs`` is for, not just JSON syntax errors.
|
|
"""
|
|
client = _mock_client(
|
|
devices=("phone",),
|
|
files={"devices/phone/log.json": '{"a": 5}'},
|
|
)
|
|
|
|
merged = sync_log(
|
|
SyncTarget(
|
|
client=client,
|
|
device_id="pc",
|
|
path_prefix="devices",
|
|
),
|
|
{},
|
|
LogCodec(
|
|
decode=_decode,
|
|
encode=_encode,
|
|
),
|
|
)
|
|
|
|
assert not merged
|