fix(maintenance): one clock per run, so a video phase 1 recovers is not fetched again in phase 2
E32 review round 1 (B7). Each phase took its own now; phase 2's "not checked this run" test then let a just-recovered video through and spent another videos.list call on it.
This commit is contained in:
@@ -45,7 +45,7 @@ def test_a_flagged_video_that_answers_again_is_unhidden(db, channel):
|
||||
)
|
||||
db.add(v)
|
||||
db.commit()
|
||||
out = maintenance._recheck_flagged(db, _YT({"v1": _item("v1")}))
|
||||
out = maintenance._recheck_flagged(db, _YT({"v1": _item("v1")}), now_utc())
|
||||
db.refresh(v)
|
||||
assert v.unavailable_since is None and v.unavailable_reason is None
|
||||
assert out == {"checked": 1, "recovered": 1, "deleted": 0, "notified": 0}
|
||||
@@ -60,7 +60,7 @@ def test_a_video_still_missing_inside_its_grace_period_is_kept_hidden(db, channe
|
||||
)
|
||||
db.add(v)
|
||||
db.commit()
|
||||
out = maintenance._recheck_flagged(db, _YT({}))
|
||||
out = maintenance._recheck_flagged(db, _YT({}), now_utc())
|
||||
assert db.get(Video, "v1") is not None
|
||||
assert out["deleted"] == 0
|
||||
|
||||
@@ -92,7 +92,7 @@ def test_past_the_grace_period_it_is_deleted_and_each_user_who_kept_it_told_once
|
||||
]
|
||||
)
|
||||
db.commit()
|
||||
out = maintenance._recheck_flagged(db, _YT({}))
|
||||
out = maintenance._recheck_flagged(db, _YT({}), now_utc())
|
||||
db.expire_all()
|
||||
assert db.get(Video, "v1") is None and db.get(Video, "v2") is None
|
||||
assert db.execute(select(PlaylistItem)).scalars().all() == [] # the cascade
|
||||
@@ -118,7 +118,7 @@ def test_rolling_revalidation_flags_the_missing_and_keeps_a_live_stream(db, chan
|
||||
)
|
||||
db.commit()
|
||||
yt = _YT({"ok": _item("ok"), "live": _item("live", liveBroadcastContent="live")})
|
||||
out = maintenance._revalidate_rolling(db, yt)
|
||||
out = maintenance._revalidate_rolling(db, yt, now_utc())
|
||||
db.expire_all()
|
||||
assert db.get(Video, "gone").unavailable_reason == "removed"
|
||||
assert db.get(Video, "ok").unavailable_since is None
|
||||
@@ -127,6 +127,41 @@ def test_rolling_revalidation_flags_the_missing_and_keeps_a_live_stream(db, chan
|
||||
assert all(db.get(Video, v).last_checked_at is not None for v in ("ok", "gone", "live"))
|
||||
|
||||
|
||||
def test_a_run_asks_youtube_about_each_video_once(db, channel, monkeypatch, make_user):
|
||||
# Phase 1 recovers v1; phase 2 must not take it as "not checked this run" and fetch it again.
|
||||
monkeypatch.setattr(maintenance.sysconfig, "get_int", lambda db, key: 10)
|
||||
monkeypatch.setattr(maintenance.quota, "backfill_reserve_reached", lambda: False)
|
||||
yt = _YT({"v1": _item("v1"), "v2": _item("v2")})
|
||||
|
||||
class _Client:
|
||||
def __init__(self, *_):
|
||||
pass
|
||||
|
||||
def __enter__(self):
|
||||
return yt
|
||||
|
||||
def __exit__(self, *_):
|
||||
return False
|
||||
|
||||
monkeypatch.setattr(maintenance, "YouTubeClient", _Client)
|
||||
monkeypatch.setattr(maintenance, "get_service_user", lambda db: make_user())
|
||||
db.add_all(
|
||||
[
|
||||
Video(
|
||||
id="v1",
|
||||
channel_id=channel.id,
|
||||
unavailable_since=now_utc(),
|
||||
unavailable_reason="removed",
|
||||
),
|
||||
Video(id="v2", channel_id=channel.id),
|
||||
]
|
||||
)
|
||||
db.commit()
|
||||
maintenance.run_maintenance(db)
|
||||
asked = [vid for batch in yt.asked for vid in batch]
|
||||
assert sorted(asked) == ["v1", "v2"]
|
||||
|
||||
|
||||
def test_an_upcoming_premiere_counts_as_abandoned_only_when_it_never_went_live():
|
||||
past = (now_utc() - timedelta(days=3)).isoformat()
|
||||
soon = (now_utc() - timedelta(days=1)).isoformat()
|
||||
|
||||
Reference in New Issue
Block a user