From 0dd744df1d1192d4eeb3fbe38c96cce76bda7376 Mon Sep 17 00:00:00 2001
From: Antoine Lambert <anlambert@softwareheritage.org>
Date: Tue, 10 Sep 2024 10:58:46 +0200
Subject: [PATCH] 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.
---
swh/loader/git/tests/test_directory.py | 2 +-
swh/loader/git/tests/test_from_disk.py | 4 ++--
swh/loader/git/tests/test_loader.py | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/swh/loader/git/tests/test_directory.py b/swh/loader/git/tests/test_directory.py
index 4f4e8713..2daba7aa 100644
--- a/swh/loader/git/tests/test_directory.py
+++ b/swh/loader/git/tests/test_directory.py
@@ -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,
diff --git a/swh/loader/git/tests/test_from_disk.py b/swh/loader/git/tests/test_from_disk.py
index 1de43661..b4191278 100644
--- a/swh/loader/git/tests/test_from_disk.py
+++ b/swh/loader/git/tests/test_from_disk.py
@@ -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,
diff --git a/swh/loader/git/tests/test_loader.py b/swh/loader/git/tests/test_loader.py
index f54b16e1..41fa0d5e 100644
--- a/swh/loader/git/tests/test_loader.py
+++ b/swh/loader/git/tests/test_loader.py
@@ -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"
--
GitLab