Skip to content
Snippets Groups Projects
Commit 0dd744df authored by Antoine Lambert's avatar Antoine Lambert
Browse files

tests: Fix numerous tests after recent changes in loader-core

BaseLoader.load now returns a dict with an extra error field when
a loading fails.
parent 48d0acfa
No related branches found
No related tags found
1 merge request!188tests: Fix numerous tests after recent changes in loader-core
Pipeline #10838 failed
......@@ -227,7 +227,7 @@ def test_loader_git_directory_hash_mismatch(swh_storage, datadir, tmp_path):
actual_result = loader.load()
# Ingestion fails because the checks failed
assert actual_result == {"status": "failed"}
assert actual_result["status"] == "failed"
assert get_stats(swh_storage) == {
"content": 0,
"directory": 0,
......
......@@ -183,7 +183,7 @@ class CommonGitLoaderTests:
self.loader.get_contents = None
res = self.loader.load()
assert res == {"status": "failed"}
assert res["status"] == "failed"
assert_last_visit_matches(
self.loader.storage,
......@@ -205,7 +205,7 @@ class CommonGitLoaderTests:
)
res = self.loader.load()
assert res == {"status": "failed"}
assert res["status"] == "failed"
assert_last_visit_matches(
self.loader.storage,
......
......@@ -109,7 +109,7 @@ class CommonGitLoaderNotFound:
mock.side_effect = failure_exception
res = self.loader.load()
assert res == {"status": "failed"}
assert res["status"] == "failed"
assert_last_visit_matches(
self.loader.storage,
......@@ -405,11 +405,11 @@ class TestGitLoader(FullGitLoaderTests, CommonGitLoaderNotFound):
corrupted_release = attr.evolve(release, id=b"\x00" * 20)
release_get = mocker.patch.object(self.loader.storage, "release_get")
release_get.return_value = [corrupted_release]
assert self.loader.load() == {"status": "failed"}
assert self.loader.load()["status"] == "failed"
elif missing_object:
revision_get = mocker.patch.object(self.loader.storage, "revision_get")
revision_get.return_value = [None]
assert self.loader.load() == {"status": "failed"}
assert self.loader.load()["status"] == "failed"
assert list(
sorted(
[c for c in statsd_calls if c[1][0] == statsd_metric],
......@@ -457,7 +457,7 @@ class TestGitLoader(FullGitLoaderTests, CommonGitLoaderNotFound):
# set max pack size to a really small value
self.loader.pack_size_bytes = 10
res = self.loader.load()
assert res == {"status": "failed"}
assert res["status"] == "failed"
assert sentry_events
assert sentry_events[0]["level"] == "error"
assert sentry_events[0]["exception"]["values"][0]["value"].startswith(
......@@ -1063,7 +1063,7 @@ class TestDumbGitLoaderWithPack(DumbGitLoaderTestBase):
# set max pack size to a really small value
self.loader.pack_size_bytes = 10
res = self.loader.load()
assert res == {"status": "failed"}
assert res["status"] == "failed"
assert sentry_events
assert sentry_events[0]["level"] == "error"
assert sentry_events[0]["exception"]["values"][0]["value"].startswith(
......@@ -1121,7 +1121,7 @@ def test_loader_too_large_pack_file_for_github_origin(
return_value=[metadata],
)
assert loader.load() == {"status": "failed"}
assert loader.load()["status"] == "failed"
assert sentry_events
assert sentry_events[0]["level"] == "error"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment