Merge branch 'master' into predup_type_playlist

This commit is contained in:
Barbara Miller 2025-07-25 15:22:22 -07:00 committed by GitHub
commit a93bf13252
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 45 additions and 69 deletions

View file

@ -68,6 +68,7 @@ def test_basics(rethinker):
"seeds": [{"url": "http://example.com"}, {"url": "https://example.org/"}]
},
"status": "ACTIVE",
"pdfs_only": False,
"starts_and_stops": [{"start": job.starts_and_stops[0]["start"], "stop": None}],
"account_id": None,
}
@ -84,12 +85,12 @@ def test_basics(rethinker):
"last_disclaimed": brozzler.EPOCH_UTC,
"scope": {"accepts": [{"ssurt": "com,example,//http:/"}]},
"seed": "http://example.com",
"skip_ytdlp": None,
"starts_and_stops": [
{"start": sites[0].starts_and_stops[0]["start"], "stop": None}
],
"status": "ACTIVE",
"account_id": None,
"video_capture": "ENABLE_VIDEO_CAPTURE",
}
assert sites[1] == {
"claimed": False,
@ -99,7 +100,6 @@ def test_basics(rethinker):
"last_disclaimed": brozzler.EPOCH_UTC,
"scope": {"accepts": [{"ssurt": "org,example,//https:/"}]},
"seed": "https://example.org/",
"skip_ytdlp": None,
"starts_and_stops": [
{
"start": sites[1].starts_and_stops[0]["start"],
@ -108,6 +108,7 @@ def test_basics(rethinker):
],
"status": "ACTIVE",
"account_id": None,
"video_capture": "ENABLE_VIDEO_CAPTURE",
}
pages = list(frontier.site_pages(sites[0].id))
@ -1054,6 +1055,8 @@ def test_max_claimed_sites_cross_job(rethinker):
rr.table("sites").delete().run()
# Works locally, but reliably fails in CI.
@pytest.mark.xfail
def test_max_claimed_sites_load_perf(rethinker):
rr = rethinker
frontier = brozzler.RethinkDbFrontier(rr)