mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 21:47:02 +01:00
Krzysztof kuhy Rudnicki
325d5a8baa
RunnerUp can now upload to Endurain directly as well as through the WebDAV inbox, and the two paths cannot see each other: the same run landed twice (activities 14 and 15, identical start time, distances differing only by tcx/gpx rounding). The ledger only knows what this importer handled, so it could not catch it. Add a third dedupe check that asks Endurain what it already holds, queried once per run. Endurain exposes no query-by-start-time endpoint, so a page of recent activities is fetched and compared client-side, with a +/-120s tolerance: the file for activity 15 embeds 21:51:04Z while the server stored 21:51:05Z, so exact equality misses the very duplicate that motivated this. A failed or unauthorised query returns None, never an empty list, so it can never be read as "nothing matches" and upload on the strength of it. Export filenames are parsed as LOCAL wall-clock time. RunnerUp_2026-08-14- 00-58-45_Running is 2026-08-13 22:58:45 UTC; reading it as UTC would move a late-evening run onto the wrong day and defeat the comparison. Also fix the adb fallback, which broke the moment a second device attached: phone_attached() returned true if ANY device was in the 'device' state, then every bare adb call failed with "more than one device/emulator" as a warning on a path nobody watches. The serial is now resolved once and threaded into every call as -s. Ambiguity is settled by configuration, never by guessing -- several devices and no ENDURAIN_ADB_SERIAL means the fallback is skipped. The remote check stays inert until the API key is granted activities:read; until then it falls back to the ledger, which is the previous behaviour. 85 tests, 100% branch coverage on all four modules, no suppressions. The oversized test modules are split by concern to stay under the 250-line cap. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GbYEnfGnf1988cdFdGebot
139 lines
4.1 KiB
Python
139 lines
4.1 KiB
Python
"""End-to-end orchestration: environment wiring and exit status."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from python_pkg.endurain_import.__main__ import _route_rejected, main
|
|
from python_pkg.endurain_import.tests.conftest import (
|
|
_env,
|
|
_file,
|
|
_patch_client,
|
|
_StubMainClient,
|
|
)
|
|
from python_pkg.endurain_import.upload import Outcome, Result
|
|
|
|
|
|
def test_main_returns_one_when_unreachable(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
_env(monkeypatch, tmp_path, inbox)
|
|
_patch_client(
|
|
monkeypatch,
|
|
_StubMainClient(Result(Outcome.OK, 1, "ok"), reachable=False),
|
|
)
|
|
assert main() == 1
|
|
|
|
|
|
def test_main_succeeds_with_empty_inbox(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
_env(monkeypatch, tmp_path, inbox)
|
|
_patch_client(monkeypatch, _StubMainClient(Result(Outcome.OK, 1, "ok")))
|
|
assert main() == 0
|
|
|
|
|
|
def test_main_imports_and_returns_zero(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
_file(inbox)
|
|
_env(monkeypatch, tmp_path, inbox)
|
|
_patch_client(monkeypatch, _StubMainClient(Result(Outcome.OK, 3, "ok")))
|
|
assert main() == 0
|
|
assert (inbox / "processed" / "RunnerUp_ts_Running.tcx").exists()
|
|
|
|
|
|
def test_main_fails_closed_on_ambiguous(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
_file(inbox)
|
|
_env(monkeypatch, tmp_path, inbox)
|
|
_patch_client(
|
|
monkeypatch, _StubMainClient(Result(Outcome.AMBIGUOUS, None, "timeout"))
|
|
)
|
|
assert main() == 1
|
|
|
|
|
|
def test_main_fails_closed_on_rejection(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
_file(inbox)
|
|
_env(monkeypatch, tmp_path, inbox, ENDURAIN_BULK_DIR=str(tmp_path / "bulk"))
|
|
_patch_client(monkeypatch, _StubMainClient(Result(Outcome.REJECTED, None, "400")))
|
|
assert main() == 1
|
|
|
|
|
|
def test_main_prefers_tcx_over_gpx(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
"""When both formats are pending, the richer TCX must be the one uploaded."""
|
|
stem = "RunnerUp_2026-08-22-23-51-04_Running"
|
|
(inbox / f"{stem}.gpx").write_text("<gpx/>")
|
|
(inbox / f"{stem}.tcx").write_text("<tcx/>")
|
|
_env(monkeypatch, tmp_path, inbox)
|
|
|
|
uploaded: list[str] = []
|
|
|
|
class _Recorder(_StubMainClient):
|
|
def upload(self, path: Path) -> Result:
|
|
uploaded.append(path.name)
|
|
return Result(Outcome.OK, 1, "ok")
|
|
|
|
_patch_client(monkeypatch, _Recorder(Result(Outcome.OK, 1, "ok")))
|
|
assert main() == 0
|
|
assert uploaded == [f"{stem}.tcx"]
|
|
|
|
|
|
def test_main_runs_adb_fallback_when_enabled(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
_env(monkeypatch, tmp_path, inbox)
|
|
monkeypatch.delenv("ENDURAIN_NO_ADB")
|
|
called: list[Path] = []
|
|
import python_pkg.endurain_import.__main__ as mod
|
|
|
|
def _record(path: Path) -> list[Path]:
|
|
called.append(path)
|
|
return []
|
|
|
|
monkeypatch.setattr(mod, "pull_from_phone", _record)
|
|
_patch_client(monkeypatch, _StubMainClient(Result(Outcome.OK, 1, "ok")))
|
|
assert main() == 0
|
|
assert called == [inbox]
|
|
|
|
|
|
def test_route_rejected_handles_unwritable_bulk_dir(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path
|
|
) -> None:
|
|
"""A broken bulk_import must not take down the whole run."""
|
|
path = tmp_path / "f.tcx"
|
|
path.write_text("x")
|
|
|
|
import shutil
|
|
|
|
def _boom(*_a: object, **_k: object) -> None:
|
|
message = "read-only filesystem"
|
|
raise OSError(message)
|
|
|
|
monkeypatch.setattr(shutil, "copy2", _boom)
|
|
_route_rejected(path, tmp_path / "bulk")
|
|
assert path.exists()
|
|
|
|
|
|
def test_main_handles_requests_exception(
|
|
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, inbox: Path
|
|
) -> None:
|
|
import requests
|
|
|
|
_env(monkeypatch, tmp_path, inbox)
|
|
|
|
class _Failing(_StubMainClient):
|
|
def about(self) -> dict[str, object]:
|
|
message = "refused"
|
|
raise requests.ConnectionError(message)
|
|
|
|
_patch_client(monkeypatch, _Failing(Result(Outcome.OK, 1, "ok")))
|
|
assert main() == 1
|