Page MenuHomeSoftware Heritage
Files F7343035

D3310.id.diff
No OneTemporary
Actions

D3310.id.diff
View Options

diff --git a/swh/storage/tests/algos/test_origin.py b/swh/storage/tests/algos/test_origin.py
--- a/swh/storage/tests/algos/test_origin.py
+++ b/swh/storage/tests/algos/test_origin.py
@@ -1,11 +1,12 @@
-# Copyright (C) 2019 The Software Heritage developers
+# Copyright (C) 2019-2020 The Software Heritage developers
# 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 pytest
+
from unittest.mock import patch
-from swh.storage import get_storage
from swh.storage.algos.origin import iter_origins
@@ -13,54 +14,58 @@
assert list(left) == list(right), msg
-storage_config = {"cls": "validate", "storage": {"cls": "memory",}}
+@pytest.fixture
+def swh_storage_backend_config():
+ yield {"cls": "validate", "storage": {"cls": "memory",}}
-def test_iter_origins():
- storage = get_storage(**storage_config)
- origins = storage.origin_add([{"url": "bar"}, {"url": "qux"}, {"url": "quuz"},])
- assert_list_eq(iter_origins(storage), origins)
- assert_list_eq(iter_origins(storage, batch_size=1), origins)
- assert_list_eq(iter_origins(storage, batch_size=2), origins)
+def test_iter_origins(swh_storage):
+ origins = swh_storage.origin_add([{"url": "bar"}, {"url": "qux"}, {"url": "quuz"},])
+ assert_list_eq(iter_origins(swh_storage), origins)
+ assert_list_eq(iter_origins(swh_storage, batch_size=1), origins)
+ assert_list_eq(iter_origins(swh_storage, batch_size=2), origins)
for i in range(1, 5):
- assert_list_eq(iter_origins(storage, origin_from=i + 1), origins[i:], i)
+ assert_list_eq(iter_origins(swh_storage, origin_from=i + 1), origins[i:], i)
assert_list_eq(
- iter_origins(storage, origin_from=i + 1, batch_size=1), origins[i:], i
+ iter_origins(swh_storage, origin_from=i + 1, batch_size=1), origins[i:], i
)
assert_list_eq(
- iter_origins(storage, origin_from=i + 1, batch_size=2), origins[i:], i
+ iter_origins(swh_storage, origin_from=i + 1, batch_size=2), origins[i:], i
)
for j in range(i, 5):
assert_list_eq(
- iter_origins(storage, origin_from=i + 1, origin_to=j + 1),
+ iter_origins(swh_storage, origin_from=i + 1, origin_to=j + 1),
origins[i:j],
(i, j),
)
assert_list_eq(
- iter_origins(storage, origin_from=i + 1, origin_to=j + 1, batch_size=1),
+ iter_origins(
+ swh_storage, origin_from=i + 1, origin_to=j + 1, batch_size=1
+ ),
origins[i:j],
(i, j),
)
assert_list_eq(
- iter_origins(storage, origin_from=i + 1, origin_to=j + 1, batch_size=2),
+ iter_origins(
+ swh_storage, origin_from=i + 1, origin_to=j + 1, batch_size=2
+ ),
origins[i:j],
(i, j),
)
@patch("swh.storage.in_memory.InMemoryStorage.origin_get_range")
-def test_iter_origins_batch_size(mock_origin_get_range):
- storage = get_storage(**storage_config)
+def test_iter_origins_batch_size(mock_origin_get_range, swh_storage):
mock_origin_get_range.return_value = []
- list(iter_origins(storage))
+ list(iter_origins(swh_storage))
mock_origin_get_range.assert_called_with(origin_from=1, origin_count=10000)
- list(iter_origins(storage, batch_size=42))
+ list(iter_origins(swh_storage, batch_size=42))
mock_origin_get_range.assert_called_with(origin_from=1, origin_count=42)

File Metadata

Mime Type
text/plain
Expires
Mar 17 2025, 6:51 PM (7 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3221655

Event Timeline

About · Developer information · Legal