Page MenuHomeSoftware Heritage
Files F7124613

D3513.id12447.diff
No OneTemporary
Actions

D3513.id12447.diff
View Options

diff --git a/swh/storage/tests/test_filter.py b/swh/storage/tests/test_filter.py
--- a/swh/storage/tests/test_filter.py
+++ b/swh/storage/tests/test_filter.py
@@ -3,6 +3,8 @@
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
+import attr
+
import pytest
from swh.storage import get_storage
@@ -12,25 +14,25 @@
def swh_storage():
storage_config = {
"cls": "pipeline",
- "steps": [{"cls": "validate"}, {"cls": "filter"}, {"cls": "memory"},],
+ "steps": [{"cls": "filter"}, {"cls": "memory"},],
}
return get_storage(**storage_config)
-def test_filtering_proxy_storage_content(swh_storage, sample_data):
- sample_content = sample_data["content"][0]
+def test_filtering_proxy_storage_content(swh_storage, sample_data_model):
+ sample_content = sample_data_model["content"][0]
- content = next(swh_storage.content_get([sample_content["sha1"]]))
+ content = next(swh_storage.content_get([sample_content.sha1]))
assert not content
s = swh_storage.content_add([sample_content])
assert s == {
"content:add": 1,
- "content:add:bytes": sample_content["length"],
+ "content:add:bytes": sample_content.length,
}
- content = next(swh_storage.content_get([sample_content["sha1"]]))
+ content = next(swh_storage.content_get([sample_content.sha1]))
assert content is not None
s = swh_storage.content_add([sample_content])
@@ -40,18 +42,19 @@
}
-def test_filtering_proxy_storage_skipped_content(swh_storage, sample_data):
- sample_content = sample_data["skipped_content"][0]
+def test_filtering_proxy_storage_skipped_content(swh_storage, sample_data_model):
+ sample_content = sample_data_model["skipped_content"][0]
+ sample_content_dict = sample_content.to_dict()
- content = next(swh_storage.skipped_content_missing([sample_content]))
- assert content["sha1"] == sample_content["sha1"]
+ content = next(swh_storage.skipped_content_missing([sample_content_dict]))
+ assert content["sha1"] == sample_content.sha1
s = swh_storage.skipped_content_add([sample_content])
assert s == {
"skipped_content:add": 1,
}
- content = list(swh_storage.skipped_content_missing([sample_content]))
+ content = list(swh_storage.skipped_content_missing([sample_content_dict]))
assert content == []
s = swh_storage.skipped_content_add([sample_content])
@@ -61,16 +64,17 @@
def test_filtering_proxy_storage_skipped_content_missing_sha1_git(
- swh_storage, sample_data
+ swh_storage, sample_data_model
):
- sample_content = sample_data["skipped_content"][0]
- sample_content2 = sample_data["skipped_content"][1]
+ sample_contents = [
+ attr.evolve(c, sha1_git=None) for c in sample_data_model["skipped_content"]
+ ]
+ sample_content, sample_content2 = [c.to_dict() for c in sample_contents[:2]]
- sample_content["sha1_git"] = sample_content2["sha1_git"] = None
content = next(swh_storage.skipped_content_missing([sample_content]))
assert content["sha1"] == sample_content["sha1"]
- s = swh_storage.skipped_content_add([sample_content])
+ s = swh_storage.skipped_content_add([sample_contents[0]])
assert s == {
"skipped_content:add": 1,
}
@@ -78,7 +82,7 @@
content = list(swh_storage.skipped_content_missing([sample_content]))
assert content == []
- s = swh_storage.skipped_content_add([sample_content2])
+ s = swh_storage.skipped_content_add([sample_contents[1]])
assert s == {
"skipped_content:add": 1,
}
@@ -87,10 +91,10 @@
assert content == []
-def test_filtering_proxy_storage_revision(swh_storage, sample_data):
- sample_revision = sample_data["revision"][0]
+def test_filtering_proxy_storage_revision(swh_storage, sample_data_model):
+ sample_revision = sample_data_model["revision"][0]
- revision = next(swh_storage.revision_get([sample_revision["id"]]))
+ revision = next(swh_storage.revision_get([sample_revision.id]))
assert not revision
s = swh_storage.revision_add([sample_revision])
@@ -98,7 +102,7 @@
"revision:add": 1,
}
- revision = next(swh_storage.revision_get([sample_revision["id"]]))
+ revision = next(swh_storage.revision_get([sample_revision.id]))
assert revision is not None
s = swh_storage.revision_add([sample_revision])
@@ -107,10 +111,10 @@
}
-def test_filtering_proxy_storage_directory(swh_storage, sample_data):
- sample_directory = sample_data["directory"][0]
+def test_filtering_proxy_storage_directory(swh_storage, sample_data_model):
+ sample_directory = sample_data_model["directory"][0]
- directory = next(swh_storage.directory_missing([sample_directory["id"]]))
+ directory = next(swh_storage.directory_missing([sample_directory.id]))
assert directory
s = swh_storage.directory_add([sample_directory])
@@ -118,7 +122,7 @@
"directory:add": 1,
}
- directory = list(swh_storage.directory_missing([sample_directory["id"]]))
+ directory = list(swh_storage.directory_missing([sample_directory.id]))
assert not directory
s = swh_storage.directory_add([sample_directory])

File Metadata

Mime Type
text/plain
Expires
Dec 21 2024, 2:25 PM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3226161

Event Timeline

About · Developer information · Legal