Skip to content
Snippets Groups Projects

Drop BWCompatInMemoryJournalWriter (released with swh.journal 0.0.30)

Compare and
4 files
+ 6
40
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -7,7 +7,6 @@ import glob
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 @@ from swh.model.model import (
SkippedContent,
Snapshot,
)
from swh.journal.writer.inmemory import InMemoryJournalWriter
OBJECT_FACTORY = {
@@ -73,29 +71,9 @@ def swh_storage_backend_config(postgresql_proc, swh_storage_postgresql):
}
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
Loading