Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion loopx/cli_commands/update_artifact.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ def target_direction(repo: str, current: str | None, target: str) -> str:
if not SHA.fullmatch(current or ""):
return "unknown"
try:
value = read_json(f"https://api.github.com/repos/{repo}/compare/{current}...{target}")
# Comparison status is present on every page. Changed-file patches
# appear only on page one and can exceed the bounded metadata reader;
# one later commit (or an empty later page) is enough for lineage.
value = read_json(
f"https://api.github.com/repos/{repo}/compare/{current}...{target}?per_page=1&page=2"
)
return str(value.get("status")) if value.get("status") in {"ahead", "behind", "diverged", "identical"} else "unknown"
except ValueError:
return "unknown"
Expand Down
32 changes: 32 additions & 0 deletions tests/test_update_artifact.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import sys
import tarfile
import threading
from urllib.parse import parse_qs, urlsplit

import pytest

Expand Down Expand Up @@ -114,6 +115,37 @@ def metadata(url):
assert requests == ["https://github.com/example/loopx/releases/download/runtime-main/loopx-runtime-" + "a" * 40 + ".json"]


@pytest.mark.parametrize("relation", ["ahead", "behind", "diverged"])
def test_direction_uses_relation_without_downloading_first_page_patches(monkeypatch, relation):
# GitHub includes all changed files on page one only. A later one-commit
# page still carries the comparison status, including an empty page.
first = json.dumps({"status": relation, "files": [{"patch": "x" * update.MAX_MANIFEST}]}).encode()
later = json.dumps({"status": relation, "commits": []}).encode()
read_json = update.read_json
with server(first) as (first_url, first_state), server(later) as (later_url, later_state):
def metadata(url):
query = parse_qs(urlsplit(url).query)
return read_json(later_url if query.get("page") == ["2"] and query.get("per_page") == ["1"] else first_url)
monkeypatch.setattr(update, "read_json", metadata)
assert update.target_direction("example/loopx", "a" * 40, "b" * 40) == relation
assert not first_state["requests"]
assert len(later_state["requests"]) == 1


def test_direction_preserves_unknown_and_identical_without_relaxing_metadata_limit(monkeypatch):
with server(b"x" * (update.MAX_MANIFEST + 1)) as (url, _state):
with pytest.raises(ValueError, match="metadata unavailable"):
update.read_json(url)
def unavailable(_url):
raise ValueError("unavailable")
monkeypatch.setattr(update, "read_json", unavailable)
assert update.target_direction("example/loopx", "a" * 40, "b" * 40) == "unknown"
assert update.target_direction("example/loopx", None, "b" * 40) == "unknown"
assert update.target_direction("example/loopx", "a" * 40, "a" * 40) == "identical"
monkeypatch.setattr(update, "read_json", lambda _url: {"status": "unrecognized"})
assert update.target_direction("example/loopx", "a" * 40, "b" * 40) == "unknown"


@pytest.mark.parametrize("ignore_range,new_etag,wrong_range", [(False, False, False), (True, False, False), (False, True, False), (False, False, True)])
def test_cross_invocation_resume_validates_origin_range_and_etag(tmp_path, ignore_range, new_etag, wrong_range):
body = os.urandom(192 * 1024)
Expand Down
Loading