diff --git a/requirements-swh-journal.txt b/requirements-swh-journal.txt --- a/requirements-swh-journal.txt +++ b/requirements-swh-journal.txt @@ -1 +1 @@ -swh.journal >= 0.0.17 +swh.journal >= 0.0.30 diff --git a/swh/storage/tests/conftest.py b/swh/storage/tests/conftest.py --- a/swh/storage/tests/conftest.py +++ b/swh/storage/tests/conftest.py @@ -7,7 +7,6 @@ import pytest from typing import Union -from unittest.mock import patch from pytest_postgresql import factories from pytest_postgresql.janitor import DatabaseJanitor, psycopg2, Version @@ -31,7 +30,6 @@ SkippedContent, Snapshot, ) -from swh.journal.writer.inmemory import InMemoryJournalWriter OBJECT_FACTORY = { @@ -73,29 +71,9 @@ } -class BWCompatInMemoryJournalWriter(InMemoryJournalWriter): - """InMemoryJournalWriter that enforces conversion of objects to model entities - - This is required until swh.journal 0.0.30 is available - """ - - def write_addition(self, object_type, object_): - if isinstance(object_, dict): - object_ = OBJECT_FACTORY[object_type](object_) - self.objects.append((object_type, object_)) - - write_update = write_addition - - @pytest.fixture def swh_storage(swh_storage_backend_config): - storage_config = {"cls": "validate", "storage": swh_storage_backend_config} - with patch( - "swh.journal.writer.inmemory.InMemoryJournalWriter", - return_value=BWCompatInMemoryJournalWriter(), - ): - storage = swh.storage.get_storage(**storage_config) - return storage + return swh.storage.get_storage(cls="validate", storage=swh_storage_backend_config) @pytest.fixture diff --git a/swh/storage/tests/test_api_client.py b/swh/storage/tests/test_api_client.py --- a/swh/storage/tests/test_api_client.py +++ b/swh/storage/tests/test_api_client.py @@ -12,7 +12,6 @@ from swh.storage import get_storage from swh.storage.tests.test_storage import TestStorageGeneratedData # noqa from swh.storage.tests.test_storage import TestStorage as _TestStorage -from swh.storage.tests.conftest import BWCompatInMemoryJournalWriter # tests are executed using imported classes (TestStorage and # TestStorageGeneratedData) using overloaded swh_storage fixture @@ -21,15 +20,9 @@ @pytest.fixture def app_server(): - storage_config = { - "cls": "memory", - "journal_writer": {"cls": "memory",}, - } - with patch( - "swh.journal.writer.inmemory.InMemoryJournalWriter", - return_value=BWCompatInMemoryJournalWriter(), - ): - server.storage = swh.storage.get_storage(**storage_config) + server.storage = swh.storage.get_storage( + cls="memory", journal_writer={"cls": "memory"} + ) yield server diff --git a/swh/storage/tests/test_api_client_dicts.py b/swh/storage/tests/test_api_client_dicts.py --- a/swh/storage/tests/test_api_client_dicts.py +++ b/swh/storage/tests/test_api_client_dicts.py @@ -12,7 +12,6 @@ import swh.storage.storage from swh.storage.tests.test_storage import TestStorageGeneratedData # noqa from swh.storage.tests.test_storage import TestStorage as _TestStorage -from swh.storage.tests.conftest import BWCompatInMemoryJournalWriter from swh.storage.tests.test_api_client import swh_storage # noqa # tests are executed using imported classes (TestStorage and @@ -26,11 +25,7 @@ "cls": "validate", "storage": {"cls": "memory", "journal_writer": {"cls": "memory",},}, } - with patch( - "swh.journal.writer.inmemory.InMemoryJournalWriter", - return_value=BWCompatInMemoryJournalWriter(), - ): - server.storage = swh.storage.get_storage(**storage_config) + server.storage = swh.storage.get_storage(**storage_config) yield server