feat: sync execution with 3s progress polling (stage 2)
- pulp_client: get_repo / sync_repo / get_task (비동기 task href 반환)
- POST /repos/{uuid}/sync: remote 확인 후 동기화 시작, 진행률 조각 반환
- GET /repos/{uuid}/progress: progress_reports 합산 → 바/퍼센트,
완료/실패 시 hx-trigger 제거로 폴링 중단
- task_store: uuid→task_href 메모리 추적 (단일 인스턴스), 대시보드 '동기화 중' 집계
- views.task_progress: state/done/total/percent + created_resources에서 새 vN
- 동기화는 안전 동작이라 확인 모달 없이 실행 (스펙 §5-1)
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -37,3 +37,27 @@ def test_get_raises_on_http_error():
|
||||
)
|
||||
with PulpClient() as pulp, pytest.raises(httpx.HTTPStatusError):
|
||||
pulp.status()
|
||||
|
||||
|
||||
@respx.mock
|
||||
def test_sync_repo_posts_remote_and_returns_task():
|
||||
import json
|
||||
|
||||
route = respx.post(
|
||||
f"{PULP_TEST_URL}/pulp/api/v3/repositories/rpm/rpm/abc/sync/"
|
||||
).mock(return_value=httpx.Response(202, json={"task": "/pulp/api/v3/tasks/t1/"}))
|
||||
with PulpClient() as pulp:
|
||||
href = pulp.sync_repo("abc", "/pulp/api/v3/remotes/rpm/rpm/r1/")
|
||||
assert href == "/pulp/api/v3/tasks/t1/"
|
||||
body = json.loads(route.calls.last.request.content)
|
||||
assert body == {"remote": "/pulp/api/v3/remotes/rpm/rpm/r1/"}
|
||||
|
||||
|
||||
@respx.mock
|
||||
def test_get_task_returns_state():
|
||||
respx.get(f"{PULP_TEST_URL}/pulp/api/v3/tasks/t1/").mock(
|
||||
return_value=httpx.Response(200, json={"state": "running"})
|
||||
)
|
||||
with PulpClient() as pulp:
|
||||
task = pulp.get_task("/pulp/api/v3/tasks/t1/")
|
||||
assert task["state"] == "running"
|
||||
|
||||
115
tests/test_sync.py
Normal file
115
tests/test_sync.py
Normal file
@@ -0,0 +1,115 @@
|
||||
import httpx
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from app import task_store
|
||||
from app.main import app, get_pulp_client
|
||||
|
||||
client = TestClient(app)
|
||||
|
||||
|
||||
class _FakePulp:
|
||||
def __init__(self, repo=None, task=None, sync_raises=False):
|
||||
self._repo = (
|
||||
{"remote": "/pulp/api/v3/remotes/rpm/rpm/r1/"} if repo is None else repo
|
||||
)
|
||||
self._task = task
|
||||
self._sync_raises = sync_raises
|
||||
self.synced = None
|
||||
|
||||
def get_repo(self, uuid):
|
||||
return self._repo
|
||||
|
||||
def sync_repo(self, uuid, remote_href):
|
||||
if self._sync_raises:
|
||||
raise httpx.ConnectError("connection refused")
|
||||
self.synced = (uuid, remote_href)
|
||||
return f"/pulp/api/v3/tasks/t-{uuid}/"
|
||||
|
||||
def get_task(self, task_href):
|
||||
return self._task
|
||||
|
||||
|
||||
def _use(fake):
|
||||
app.dependency_overrides[get_pulp_client] = lambda: fake
|
||||
|
||||
|
||||
def teardown_function():
|
||||
app.dependency_overrides.clear()
|
||||
task_store._active.clear()
|
||||
|
||||
|
||||
def test_start_sync_begins_polling_and_records_task():
|
||||
fake = _FakePulp()
|
||||
_use(fake)
|
||||
resp = client.post("/repos/abc/sync")
|
||||
assert resp.status_code == 200
|
||||
assert 'hx-get="/repos/abc/progress"' in resp.text
|
||||
assert 'hx-trigger="every 3s"' in resp.text
|
||||
assert task_store.get_task("abc") == "/pulp/api/v3/tasks/t-abc/"
|
||||
assert fake.synced == ("abc", "/pulp/api/v3/remotes/rpm/rpm/r1/")
|
||||
|
||||
|
||||
def test_start_sync_without_remote_is_rejected():
|
||||
_use(_FakePulp(repo={})) # remote 미설정
|
||||
resp = client.post("/repos/abc/sync")
|
||||
assert resp.status_code == 400
|
||||
assert "remote" in resp.text
|
||||
assert task_store.get_task("abc") is None
|
||||
|
||||
|
||||
def test_start_sync_handles_pulp_error():
|
||||
_use(_FakePulp(sync_raises=True))
|
||||
resp = client.post("/repos/abc/sync")
|
||||
assert resp.status_code == 502
|
||||
assert "동기화 시작 실패" in resp.text
|
||||
assert task_store.get_task("abc") is None
|
||||
|
||||
|
||||
def test_progress_running_renders_bar_and_keeps_polling():
|
||||
task_store.set_task("abc", "/pulp/api/v3/tasks/t1/")
|
||||
_use(
|
||||
_FakePulp(
|
||||
task={"state": "running", "progress_reports": [{"done": 4, "total": 8}]}
|
||||
)
|
||||
)
|
||||
resp = client.get("/repos/abc/progress")
|
||||
assert resp.status_code == 200
|
||||
assert "50%" in resp.text
|
||||
assert 'hx-trigger="every 3s"' in resp.text
|
||||
assert task_store.get_task("abc") is not None # 아직 추적 중
|
||||
|
||||
|
||||
def test_progress_completed_stops_polling_and_clears():
|
||||
task_store.set_task("abc", "/pulp/api/v3/tasks/t1/")
|
||||
_use(
|
||||
_FakePulp(
|
||||
task={
|
||||
"state": "completed",
|
||||
"created_resources": [
|
||||
"/pulp/api/v3/repositories/rpm/rpm/abc/versions/7/"
|
||||
],
|
||||
}
|
||||
)
|
||||
)
|
||||
resp = client.get("/repos/abc/progress")
|
||||
assert "동기화 완료" in resp.text
|
||||
assert "v7" in resp.text
|
||||
assert "hx-trigger" not in resp.text # 폴링 중단
|
||||
assert task_store.get_task("abc") is None # 정리됨
|
||||
|
||||
|
||||
def test_progress_failed_shows_error_and_clears():
|
||||
task_store.set_task("abc", "/pulp/api/v3/tasks/t1/")
|
||||
_use(_FakePulp(task={"state": "failed", "error": {"description": "GPG 검증 실패"}}))
|
||||
resp = client.get("/repos/abc/progress")
|
||||
assert "동기화 실패" in resp.text
|
||||
assert "GPG 검증 실패" in resp.text
|
||||
assert "hx-trigger" not in resp.text
|
||||
assert task_store.get_task("abc") is None
|
||||
|
||||
|
||||
def test_progress_idle_when_no_active_task():
|
||||
_use(_FakePulp())
|
||||
resp = client.get("/repos/zzz/progress")
|
||||
assert resp.status_code == 200
|
||||
assert "hx-trigger" not in resp.text # 폴링하지 않음
|
||||
@@ -70,3 +70,34 @@ def test_summarize_counts():
|
||||
"gpg_pass": 2,
|
||||
"total_packages": 150,
|
||||
}
|
||||
|
||||
|
||||
def test_summarize_includes_syncing_count():
|
||||
assert views.summarize([], syncing=2)["syncing"] == 2
|
||||
|
||||
|
||||
def test_task_progress_running_sums_reports():
|
||||
task = {
|
||||
"state": "running",
|
||||
"progress_reports": [{"done": 5, "total": 10}, {"done": 3, "total": 10}],
|
||||
}
|
||||
p = views.task_progress(task)
|
||||
assert p["running"] is True
|
||||
assert p["completed"] is False
|
||||
assert (p["done"], p["total"], p["percent"]) == (8, 20, 40)
|
||||
|
||||
|
||||
def test_task_progress_completed_extracts_version():
|
||||
task = {
|
||||
"state": "completed",
|
||||
"created_resources": ["/pulp/api/v3/repositories/rpm/rpm/x/versions/4/"],
|
||||
}
|
||||
p = views.task_progress(task)
|
||||
assert p["completed"] is True
|
||||
assert p["new_version"] == 4
|
||||
|
||||
|
||||
def test_task_progress_failed_surfaces_error():
|
||||
p = views.task_progress({"state": "failed", "error": {"description": "boom"}})
|
||||
assert p["failed"] is True
|
||||
assert p["error"] == "boom"
|
||||
|
||||
Reference in New Issue
Block a user