Page MenuHomeSoftware Heritage
Files F7066204

D2095.id7027.diff
No OneTemporary
Actions

D2095.id7027.diff
View Options

diff --git a/swh/storage/tests/test_in_memory.py b/swh/storage/tests/test_in_memory.py
--- a/swh/storage/tests/test_in_memory.py
+++ b/swh/storage/tests/test_in_memory.py
@@ -2,77 +2,46 @@
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
-import unittest
import pytest
-from swh.storage.in_memory import Storage, ENABLE_ORIGIN_IDS
+import swh.storage
from swh.storage.tests.test_storage import \
- CommonTestStorage, CommonPropTestStorage
+ TestStorage, TestStorageCommonProp
-class TestInMemoryStorage(CommonTestStorage, unittest.TestCase):
+@pytest.fixture
+def swh_storage(tmp_path):
+
+ objdir = tmp_path / 'objstorage'
+ objdir.mkdir()
+ storage_config = {
+ 'cls': 'memory',
+ 'args': {
+ 'journal_writer': {
+ 'cls': 'inmemory',
+ },
+ },
+ }
+ storage = swh.storage.get_storage(**storage_config)
+ return storage
+
+
+class TestInMemoryStorage(TestStorage):
"""Test the in-memory storage API
This class doesn't define any tests as we want identical
functionality between local and remote storage. All the tests are
therefore defined in CommonTestStorage.
"""
- _test_origin_ids = ENABLE_ORIGIN_IDS
-
- def setUp(self):
- super().setUp()
- self.reset_storage()
-
- @pytest.mark.skip('postgresql-specific test')
- def test_content_add_db(self):
- pass
-
- @pytest.mark.skip('postgresql-specific test')
- def test_skipped_content_add_db(self):
- pass
-
- @pytest.mark.skip('postgresql-specific test')
- def test_content_add_metadata_db(self):
- pass
-
- if not _test_origin_ids:
- @pytest.mark.skip('requires origin ids')
- def test_origin_metadata_add(self):
- pass
-
- @pytest.mark.skip('requires origin ids')
- def test_origin_metadata_get(self):
- pass
-
- @pytest.mark.skip('requires origin ids')
- def test_origin_metadata_get_by_provider_type(self):
- pass
-
- def reset_storage(self):
- self.storage = Storage(journal_writer={'cls': 'memory'})
- self.journal_writer = self.storage.journal_writer
@pytest.mark.property_based
-class PropTestInMemoryStorage(CommonPropTestStorage, unittest.TestCase):
+class TestInMemoryStorageProp(TestStorageCommonProp):
"""Test the in-memory storage API
This class doesn't define any tests as we want identical
functionality between local and remote storage. All the tests are
therefore defined in CommonPropTestStorage.
"""
- _test_origin_ids = ENABLE_ORIGIN_IDS
-
- def setUp(self):
- super().setUp()
- self.storage = Storage()
-
- def reset_storage(self):
- self.storage = Storage()
-
- if not _test_origin_ids:
- @pytest.mark.skip('requires origin ids')
- def test_origin_get_range(self, new_origins):
- pass

File Metadata

Mime Type
text/plain
Expires
Nov 5 2024, 1:05 AM (11 w, 17 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3218076

Event Timeline

About · Developer information · Legal