reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Simplify origin comparison and improve pytest diff on failure

Browse source 
By using a single equality instead of checking len() then zip()
to check one by one, pytest can find the common/missing elements
and print them nicely when the two lists are unequal.
This commit is contained in:
Valentin Lorentz 2022-08-24 17:21:24 +02:00
parent 4b511b4181
commit b7ec6cb120
8 changed files with 53 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

22
swh/lister/arch/tests/test_lister.py
View file

@ -1373,28 +1373,22 @@ def test_arch_lister(datadir, requests_mock_datadir, swh_scheduler):
assert res.pages == 9
assert res.origins == 12
expected_origins_sorted = sorted(expected_origins, key=lambda x: x.get("url"))
scheduler_origins_sorted = sorted(
swh_scheduler.get_listed_origins(lister.lister_obj.id).results,
key=lambda x: x.url,
)
assert len(scheduler_origins_sorted) == len(expected_origins_sorted)
scheduler_origins = swh_scheduler.get_listed_origins(lister.lister_obj.id).results
assert [
(
scheduled.visit_type,
scheduled.url,
scheduled.extra_loader_arguments.get("artifacts"),
scheduled.extra_loader_arguments.get("arch_metadata"),
scheduled.extra_loader_arguments["artifacts"],
scheduled.extra_loader_arguments["arch_metadata"],
)
for scheduled in scheduler_origins_sorted
for scheduled in sorted(scheduler_origins, key=lambda scheduled: scheduled.url)
] == [
(
"arch",
expected.get("url"),
expected.get("extra_loader_arguments").get("artifacts"),
expected.get("extra_loader_arguments").get("arch_metadata"),
expected["url"],
expected["extra_loader_arguments"]["artifacts"],
expected["extra_loader_arguments"]["arch_metadata"],
)
for expected in expected_origins_sorted
for expected in sorted(expected_origins, key=lambda expected: expected["url"])
]