Page MenuHomeSoftware Heritage
Files F9348482

D5821.diff
No OneTemporary
Actions

D5821.diff
View Options

diff --git a/swh/provenance/tests/test_provenance_db.py b/swh/provenance/tests/test_provenance_db.py
--- a/swh/provenance/tests/test_provenance_db.py
+++ b/swh/provenance/tests/test_provenance_db.py
@@ -158,78 +158,3 @@
assert bytes(blob) == contentid
assert bytes(rev).hex() == expected["rev"]
assert int(date.timestamp()) == expected["date"]
-
-
-def test_provenance_content_find_all(provenance, storage_and_CMDBTS, archive):
- storage, data = storage_and_CMDBTS
- for revision in data["revision"]:
- entry = RevisionEntry(
- id=revision["id"],
- date=ts2dt(revision["date"]),
- root=revision["directory"],
- )
- revision_add(provenance, archive, [entry])
-
- expected_content = {
- # fmt: off
- '43f3c871310a8e524004e91f033e7fb3b0bc8475': [
- ('35ccb8dd1b53d2d8a5c1375eb513ef2beaa79ae5', 1609757158.0, b'README.md')],
- '6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1': [
- ('9e36e095b79e36a3da104ce272989b39cd68aefd', 1610644094.0, b'Red/Blue/Green/a'), # noqa: E501
- ('bfbfcc72ae7fc35d6941386c36280512e6b38440', 1610644097.0, b'Red/Blue/Green/a'), # noqa: E501
- ('0a31c9d509783abfd08f9fdfcd3acae20f17dfd0', 1610644099.0, b'Red/Blue/Green/a'), # noqa: E501
- ('ca6ec564c69efd2e5c70fb05486fd3f794765a04', 1610644101.0, b'Red/Green/a'),
- ('ca6ec564c69efd2e5c70fb05486fd3f794765a04', 1610644101.0, b'Red/a'),
- ('fc6e10b7d41b1d56a94091134e3683ce91e80d91', 1610644103.0, b'Red/Blue/Green/a'), # noqa: E501
- ('ba00e89d47dc820bb32c783af7123ffc6e58b56d', 1610644111.0, b'Dark/a')],
- '9f6e04be05297905f1275d3f4e0bb0583458b2e8': [
- ('bfbfcc72ae7fc35d6941386c36280512e6b38440', 1610644097.0, b'Red/Blue/Green/b'), # noqa: E501
- ('0a31c9d509783abfd08f9fdfcd3acae20f17dfd0', 1610644099.0, b'Red/Blue/Green/b'), # noqa: E501
- ('ca6ec564c69efd2e5c70fb05486fd3f794765a04', 1610644101.0, b'Red/Green/b'),
- ('fc6e10b7d41b1d56a94091134e3683ce91e80d91', 1610644103.0, b'Red/Blue/Green/b')], # noqa: E501
- 'a28fa70e725ebda781e772795ca080cd737b823c': [
- ('0a31c9d509783abfd08f9fdfcd3acae20f17dfd0', 1610644099.0, b'Red/Blue/c'),
- ('fc6e10b7d41b1d56a94091134e3683ce91e80d91', 1610644103.0, b'Red/Blue/c')],
- 'c0229d305adf3edf49f031269a70e3e87665fe88': [
- ('1d1fcf1816a8a2a77f9b1f342ba11d0fe9fd7f17', 1610644105.0, b'Purple/d'),
- ('9a71f967ae1a125be9b6569cc4eccec0aecabb7c', 1610644107.0, b'Purple/Brown/Purple/d'), # noqa: E501
- ('4fde4ea4494a630030a4bda99d03961d9add00c7', 1610644109.0, b'Dark/Brown/Purple/d'), # noqa: E501
- ('4fde4ea4494a630030a4bda99d03961d9add00c7', 1610644109.0, b'Dark/d'),
- ('ba00e89d47dc820bb32c783af7123ffc6e58b56d', 1610644111.0, b'Dark/Brown/Purple/d'), # noqa: E501
- ('ba00e89d47dc820bb32c783af7123ffc6e58b56d', 1610644111.0, b'Dark/Brown/Purple/e')], # noqa: E501
- '94ba40161084e8b80943accd9d24e1f9dd47189b': [
- ('55d4dc9471de6144f935daf3c38878155ca274d5', 1610644113.0, b'Dark/Brown/Purple/f'), # noqa: E501
- ('55d4dc9471de6144f935daf3c38878155ca274d5', 1610644113.0, b'Dark/Brown/Purple/g'), # noqa: E501
- ('55d4dc9471de6144f935daf3c38878155ca274d5', 1610644113.0, b'Dark/f'),
- ('a8939755d0be76cfea136e9e5ebce9bc51c49fef', 1610644116.0, b'Dark/Brown/Purple/f'), # noqa: E501
- ('a8939755d0be76cfea136e9e5ebce9bc51c49fef', 1610644116.0, b'Dark/Brown/Purple/g'), # noqa: E501
- ('ca1774a07b6e02c1caa7ae678924efa9259ee7c6', 1610644118.0, b'Paris/Brown/Purple/f'), # noqa: E501
- ('ca1774a07b6e02c1caa7ae678924efa9259ee7c6', 1610644118.0, b'Paris/Brown/Purple/g'), # noqa: E501
- ('611fe71d75b6ea151b06e3845c09777acc783d82', 1610644120.0, b'Paris/Berlin/Purple/f'), # noqa: E501
- ('611fe71d75b6ea151b06e3845c09777acc783d82', 1610644120.0, b'Paris/Berlin/Purple/g'), # noqa: E501
- ('4c5551b4969eb2160824494d40b8e1f6187fc01e', 1610644122.0, b'Paris/Berlin/Purple/f'), # noqa: E501
- ('4c5551b4969eb2160824494d40b8e1f6187fc01e', 1610644122.0, b'Paris/Berlin/Purple/g'), # noqa: E501
- ('4c5551b4969eb2160824494d40b8e1f6187fc01e', 1610644122.0, b'Paris/Munich/Purple/f'), # noqa: E501
- ('4c5551b4969eb2160824494d40b8e1f6187fc01e', 1610644122.0, b'Paris/Munich/Purple/g'), # noqa: E501
- ('4c5551b4969eb2160824494d40b8e1f6187fc01e', 1610644122.0, b'Paris/Purple/f'), # noqa: E501
- ('4c5551b4969eb2160824494d40b8e1f6187fc01e', 1610644122.0, b'Paris/Purple/g')], # noqa: E501
- '5e8f9ceaee9dafae2e3210e254fdf170295f8b5b': [
- ('a8939755d0be76cfea136e9e5ebce9bc51c49fef', 1610644116.0, b'Dark/h')],
- 'bbd54b961764094b13f10cef733e3725d0a834c3': [
- ('ca1774a07b6e02c1caa7ae678924efa9259ee7c6', 1610644118.0, b'Paris/i')],
- '7ce4fe9a22f589fa1656a752ea371b0ebc2106b1': [
- ('611fe71d75b6ea151b06e3845c09777acc783d82', 1610644120.0, b'Paris/j')],
- 'cb79b39935c9392fa5193d9f84a6c35dc9c22c75': [
- ('4c5551b4969eb2160824494d40b8e1f6187fc01e', 1610644122.0, b'Paris/k')],
- # fmt: on
- }
-
- for content, results in expected_content.items():
- contentid = bytes.fromhex(content)
- occurrences = [
- (blob.hex(), rev.hex(), date.timestamp(), path)
- for blob, rev, date, path in provenance.content_find_all(contentid)
- ]
- expected = [(content, *result) for result in results]
- assert len(occurrences) == len(expected)
- assert set(occurrences) == set(expected)
diff --git a/swh/provenance/tests/test_provenance_db_storage.py b/swh/provenance/tests/test_provenance_db_storage.py
--- a/swh/provenance/tests/test_provenance_db_storage.py
+++ b/swh/provenance/tests/test_provenance_db_storage.py
@@ -7,11 +7,14 @@
from swh.provenance.storage.archive import ArchiveStorage
-from .test_provenance_db import ( # noqa
+from .test_provenance_db import ( # noqa: F401
test_provenance_add_revision,
- test_provenance_content_find_all,
test_provenance_content_find_first,
)
+from .test_provenance_heuristics import ( # noqa: F401
+ test_provenance_heuristics,
+ test_provenance_heuristics_content_find_all,
+)
@pytest.fixture

File Metadata

Mime Type
text/plain
Expires
Jul 3 2025, 6:33 PM (5 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3226321

Event Timeline

About · Developer information · Legal