tests: Fix errors after swh-scheduler API update
The PaginatedListedOriginList model has been updated in rDSCHb93aa5be2c2d5dc2130e1027698f3e1255052d8d and the origins field has been renamed to results.
This commit is contained in:
parent
b6a69b2ed9
commit
ea8ecee541
9 changed files with 22 additions and 22 deletions
|
@ -59,7 +59,7 @@ def test_bitbucket_incremental_lister(
|
|||
# First listing
|
||||
stats = lister.run()
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
|
||||
assert stats.pages == 2
|
||||
assert stats.origins == 20
|
||||
|
@ -115,7 +115,7 @@ def test_bitbucket_lister_rate_limit_hit(
|
|||
|
||||
assert stats.pages == 2
|
||||
assert stats.origins == 20
|
||||
assert len(swh_scheduler.get_listed_origins(lister.lister_obj.id).origins) == 20
|
||||
assert len(swh_scheduler.get_listed_origins(lister.lister_obj.id).results) == 20
|
||||
|
||||
|
||||
def test_bitbucket_full_lister(
|
||||
|
@ -165,7 +165,7 @@ def test_bitbucket_full_lister(
|
|||
assert stats.pages == 2
|
||||
assert stats.origins == 20
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
|
||||
# 20 because scheduler upserts based on (id, type, url)
|
||||
assert len(scheduler_origins) == 20
|
||||
|
|
|
@ -51,7 +51,7 @@ def test_lister_cgit_run(requests_mock_datadir, swh_scheduler):
|
|||
# test page parsing
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(
|
||||
lister_cgit.lister_obj.id
|
||||
).origins
|
||||
).results
|
||||
assert len(scheduler_origins) == expected_nb_origins
|
||||
|
||||
# test listed repositories
|
||||
|
|
|
@ -89,7 +89,7 @@ def test_gitea_full_listing(
|
|||
calls = [mocker.call(p1_result), mocker.call(p2_result)]
|
||||
lister.get_origins_from_page.assert_has_calls(calls)
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
|
||||
check_listed_origins(p1_origin_urls + p2_origin_urls, scheduler_origins)
|
||||
|
||||
|
@ -147,5 +147,5 @@ def test_gitea_list_http_error(swh_scheduler, requests_mock, http_code):
|
|||
with pytest.raises(requests.HTTPError):
|
||||
lister.run()
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
assert len(scheduler_origins) == 0
|
||||
|
|
|
@ -88,8 +88,8 @@ def check_origin_4321(swh_scheduler: SchedulerInterface, lister: Lister) -> None
|
|||
origin_4321_req = swh_scheduler.get_listed_origins(
|
||||
url="https://github.com/origin/4321"
|
||||
)
|
||||
assert len(origin_4321_req.origins) == 1
|
||||
origin_4321 = origin_4321_req.origins[0]
|
||||
assert len(origin_4321_req.results) == 1
|
||||
origin_4321 = origin_4321_req.results[0]
|
||||
assert origin_4321.lister_id == lister.id
|
||||
assert origin_4321.visit_type == "git"
|
||||
assert origin_4321.last_update == datetime.datetime(
|
||||
|
@ -102,8 +102,8 @@ def check_origin_5555(swh_scheduler: SchedulerInterface, lister: Lister) -> None
|
|||
origin_5555_req = swh_scheduler.get_listed_origins(
|
||||
url="https://github.com/origin/5555"
|
||||
)
|
||||
assert len(origin_5555_req.origins) == 1
|
||||
origin_5555 = origin_5555_req.origins[0]
|
||||
assert len(origin_5555_req.results) == 1
|
||||
origin_5555 = origin_5555_req.results[0]
|
||||
assert origin_5555.lister_id == lister.id
|
||||
assert origin_5555.visit_type == "git"
|
||||
assert origin_5555.last_update is None
|
||||
|
@ -121,7 +121,7 @@ def test_from_empty_state(
|
|||
assert res == ListerStats(pages=NUM_PAGES, origins=ORIGIN_COUNT)
|
||||
|
||||
listed_origins = swh_scheduler.get_listed_origins(limit=ORIGIN_COUNT + 1)
|
||||
assert len(listed_origins.origins) == ORIGIN_COUNT
|
||||
assert len(listed_origins.results) == ORIGIN_COUNT
|
||||
assert listed_origins.next_page_token is None
|
||||
|
||||
lister_data = get_lister_data(swh_scheduler)
|
||||
|
@ -152,7 +152,7 @@ def test_incremental(swh_scheduler, caplog, requests_mocker) -> None:
|
|||
assert res == ListerStats(pages=expected_pages, origins=expected_origins)
|
||||
|
||||
listed_origins = swh_scheduler.get_listed_origins(limit=expected_origins + 1)
|
||||
assert len(listed_origins.origins) == expected_origins
|
||||
assert len(listed_origins.results) == expected_origins
|
||||
assert listed_origins.next_page_token is None
|
||||
|
||||
lister_data = get_lister_data(swh_scheduler)
|
||||
|
|
|
@ -47,7 +47,7 @@ def test_lister_gitlab(datadir, swh_scheduler, requests_mock):
|
|||
|
||||
scheduler_origins = lister.scheduler.get_listed_origins(
|
||||
lister.lister_obj.id
|
||||
).origins
|
||||
).results
|
||||
assert len(scheduler_origins) == expected_nb_origins
|
||||
|
||||
for listed_origin in scheduler_origins:
|
||||
|
@ -88,7 +88,7 @@ def test_lister_gitlab_with_pages(swh_scheduler, requests_mock, datadir):
|
|||
|
||||
scheduler_origins = lister.scheduler.get_listed_origins(
|
||||
lister.lister_obj.id
|
||||
).origins
|
||||
).results
|
||||
assert len(scheduler_origins) == expected_nb_origins
|
||||
|
||||
for listed_origin in scheduler_origins:
|
||||
|
@ -148,7 +148,7 @@ def test_lister_gitlab_incremental(swh_scheduler, requests_mock, datadir):
|
|||
assert lister.lister_obj.id == lister2.lister_obj.id
|
||||
scheduler_origins = lister2.scheduler.get_listed_origins(
|
||||
lister2.lister_obj.id
|
||||
).origins
|
||||
).results
|
||||
|
||||
assert len(scheduler_origins) == len(response1) + len(response2) + len(response3)
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ def test_npm_lister_full(
|
|||
]
|
||||
)
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
|
||||
_check_listed_npm_packages(
|
||||
lister,
|
||||
|
@ -154,7 +154,7 @@ def test_npm_lister_incremental(
|
|||
]
|
||||
)
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
|
||||
_check_listed_npm_packages(
|
||||
lister,
|
||||
|
|
|
@ -109,7 +109,7 @@ def test_lister(
|
|||
assert stats.pages == 2
|
||||
assert stats.origins == expected_nb_origins
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
|
||||
assert len(scheduler_origins) == expected_nb_origins
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ def test_pypi_list(swh_scheduler, requests_mock, mocker, pypi_packages_testdata)
|
|||
|
||||
stats = lister.run()
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
|
||||
lister.session.get.assert_called_once_with(lister.PACKAGE_LIST_URL)
|
||||
lister.get_origins_from_page.assert_called_once_with(t_names)
|
||||
|
@ -76,5 +76,5 @@ def test_pypi_list_http_error(swh_scheduler, requests_mock, mocker, http_code):
|
|||
|
||||
lister.session.get.assert_called_once_with(lister.PACKAGE_LIST_URL)
|
||||
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).origins
|
||||
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
|
||||
assert len(scheduler_origins) == 0
|
||||
|
|
|
@ -93,9 +93,9 @@ def check_listed_origins(swh_scheduler, lister, stored_lister):
|
|||
# And check the state of origins in the scheduler
|
||||
ret = swh_scheduler.get_listed_origins()
|
||||
assert ret.next_page_token is None
|
||||
assert len(ret.origins) == len(lister_urls)
|
||||
assert len(ret.results) == len(lister_urls)
|
||||
|
||||
for origin, expected_url in zip(ret.origins, lister_urls):
|
||||
for origin, expected_url in zip(ret.results, lister_urls):
|
||||
assert origin.url == expected_url
|
||||
assert origin.lister_id == stored_lister.id
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue