diff --git a/swh/provenance/tests/data/synthetic_noroot_upper.txt b/swh/provenance/tests/data/synthetic_noroot_upper.txt new file mode 100644 index 0000000..b37e360 --- /dev/null +++ b/swh/provenance/tests/data/synthetic_noroot_upper.txt @@ -0,0 +1,92 @@ +1610644094.0 9e36e095b79e36a3da104ce272989b39cd68aefd R0000 +R0000 | | | R 9e36e095b79e36a3da104ce272989b39cd68aefd | 1610644094.0 + | R---C | Red/Blue/Green/a | C 6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1 | 0.0 + +1610644097.0 bfbfcc72ae7fc35d6941386c36280512e6b38440 R0001 +R0001 | | | R bfbfcc72ae7fc35d6941386c36280512e6b38440 | 1610644097.0 + | R---C | Red/Blue/Green/a | C 6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1 | -3.0 + | R---C | Red/Blue/Green/b | C 9f6e04be05297905f1275d3f4e0bb0583458b2e8 | 0.0 + +1610644099.0 0a31c9d509783abfd08f9fdfcd3acae20f17dfd0 R0002 +R0002 | | | R 0a31c9d509783abfd08f9fdfcd3acae20f17dfd0 | 1610644099.0 + | R---C | Red/Blue/c | C a28fa70e725ebda781e772795ca080cd737b823c | 0.0 + | R-D | Red/Blue/Green/ | D 4b6387dc2c85d82f0e2375461b687dabb03aa97c | -2.0 + | D-C | + a | C 6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1 | -5.0 + | D-C | + b | C 9f6e04be05297905f1275d3f4e0bb0583458b2e8 | -2.0 + +1610644101.0 ca6ec564c69efd2e5c70fb05486fd3f794765a04 R0003 +R0003 | | | R ca6ec564c69efd2e5c70fb05486fd3f794765a04 | 1610644101.0 + | R-D | Red/ | D a85553c8942940668e613b94bd31367af3342add | -4.0 + | D-C | + Green/a | C 6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1 | -7.0 + | D-C | + Green/b | C 9f6e04be05297905f1275d3f4e0bb0583458b2e8 | -4.0 + | D-C | + a | C 6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1 | -7.0 + +1610644103.0 fc6e10b7d41b1d56a94091134e3683ce91e80d91 R0004 +R0004 | | | R fc6e10b7d41b1d56a94091134e3683ce91e80d91 | 1610644103.0 + | R-D | Red/ | D 87917478bc66dc4cd35f4a708e76c4409d436ae7 | -4.0 + | D-C | + Blue/Green/a | C 6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1 | -9.0 + | D-C | + Blue/Green/b | C 9f6e04be05297905f1275d3f4e0bb0583458b2e8 | -6.0 + | D-C | + Blue/c | C a28fa70e725ebda781e772795ca080cd737b823c | -4.0 + +1610644105.0 1d1fcf1816a8a2a77f9b1f342ba11d0fe9fd7f17 R0005 +R0005 | | | R 1d1fcf1816a8a2a77f9b1f342ba11d0fe9fd7f17 | 1610644105.0 + | R---C | Purple/d | C c0229d305adf3edf49f031269a70e3e87665fe88 | 0.0 + +1610644107.0 9a71f967ae1a125be9b6569cc4eccec0aecabb7c R0006 +R0006 | | | R 9a71f967ae1a125be9b6569cc4eccec0aecabb7c | 1610644107.0 + | R-D | Purple/ | D 98170783516a25f55b77f34a97390046e2747ab7 | -2.0 + | D-C | + Brown/Purple/d | C c0229d305adf3edf49f031269a70e3e87665fe88 | -2.0 + +1610644109.0 4fde4ea4494a630030a4bda99d03961d9add00c7 R0007 +R0007 | | | R 4fde4ea4494a630030a4bda99d03961d9add00c7 | 1610644109.0 + | R-D | Dark/ | D 602ed30f501574bf93b0503eb17ca9795da7549c | -4.0 + | D-C | + Brown/Purple/d | C c0229d305adf3edf49f031269a70e3e87665fe88 | -4.0 + | D-C | + d | C c0229d305adf3edf49f031269a70e3e87665fe88 | -4.0 + +1610644111.0 ba00e89d47dc820bb32c783af7123ffc6e58b56d R0008 +R0008 | | | R ba00e89d47dc820bb32c783af7123ffc6e58b56d | 1610644111.0 + | R-D | Dark/ | D 4bbafface78adfae9abb45c54256588c1f63172f | -6.0 + | D-C | + Brown/Purple/d | C c0229d305adf3edf49f031269a70e3e87665fe88 | -6.0 + | D-C | + Brown/Purple/e | C c0229d305adf3edf49f031269a70e3e87665fe88 | -6.0 + | D-C | + a | C 6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1 | -17.0 + +1610644113.0 55d4dc9471de6144f935daf3c38878155ca274d5 R0009 +R0009 | | | R 55d4dc9471de6144f935daf3c38878155ca274d5 | 1610644113.0 + | R---C | Dark/Brown/Purple/f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | 0.0 + | R---C | Dark/Brown/Purple/g | C 94ba40161084e8b80943accd9d24e1f9dd47189b | 0.0 + | R---C | Dark/f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | 0.0 + +1610644116.0 a8939755d0be76cfea136e9e5ebce9bc51c49fef R0010 +R0010 | | | R a8939755d0be76cfea136e9e5ebce9bc51c49fef | 1610644116.0 + | R---C | Dark/h | C 5e8f9ceaee9dafae2e3210e254fdf170295f8b5b | 0.0 + | R-D | Dark/Brown/ | D 12065e97fb2202a1d3dc932f8ee9c5050a11e12b | -3.0 + | D-C | + Purple/f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -3.0 + | D-C | + Purple/g | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -3.0 + +1610644118.0 ca1774a07b6e02c1caa7ae678924efa9259ee7c6 R0011 +R0011 | | | R ca1774a07b6e02c1caa7ae678924efa9259ee7c6 | 1610644118.0 + | R---C | Paris/i | C bbd54b961764094b13f10cef733e3725d0a834c3 | 0.0 + | R-D | Paris/Brown/ | D 12065e97fb2202a1d3dc932f8ee9c5050a11e12b | -5.0 + | D-C | + Purple/f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -5.0 + | D-C | + Purple/g | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -5.0 + +1610644120.0 611fe71d75b6ea151b06e3845c09777acc783d82 R0012 +R0012 | | | R 611fe71d75b6ea151b06e3845c09777acc783d82 | 1610644120.0 + | R---C | Paris/j | C 7ce4fe9a22f589fa1656a752ea371b0ebc2106b1 | 0.0 + | R-D | Paris/Berlin/ | D 12065e97fb2202a1d3dc932f8ee9c5050a11e12b | -7.0 + | D-C | + Purple/f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -7.0 + | D-C | + Purple/g | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -7.0 + +1610644122.0 4c5551b4969eb2160824494d40b8e1f6187fc01e R0013 +R0013 | | | R 4c5551b4969eb2160824494d40b8e1f6187fc01e | 1610644122.0 + | R---C | Paris/k | C cb79b39935c9392fa5193d9f84a6c35dc9c22c75 | 0.0 + | R-D | Paris/Berlin/ | D 12065e97fb2202a1d3dc932f8ee9c5050a11e12b | -9.0 + | D-C | + Purple/f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -9.0 + | D-C | + Purple/g | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -9.0 + | R-D | Paris/Munich/ | D 12065e97fb2202a1d3dc932f8ee9c5050a11e12b | -9.0 + | D-C | + Purple/f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -9.0 + | D-C | + Purple/g | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -9.0 + | R-D | Paris/Purple/ | D f86f65f0e58940f36c088cb1455da5bc224230bc | -9.0 + | D-C | + f | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -9.0 + | D-C | + g | C 94ba40161084e8b80943accd9d24e1f9dd47189b | -9.0 + diff --git a/swh/provenance/tests/test_provenance_db.py b/swh/provenance/tests/test_provenance_db.py index dcf5101..1ebedd7 100644 --- a/swh/provenance/tests/test_provenance_db.py +++ b/swh/provenance/tests/test_provenance_db.py @@ -1,232 +1,241 @@ # Copyright (C) 2021 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 datetime +import pytest + from swh.model.tests.swh_model_data import TEST_OBJECTS from swh.provenance.origin import OriginEntry from swh.provenance.provenance import origin_add, revision_add from swh.provenance.revision import RevisionEntry from swh.provenance.tests.conftest import synthetic_result def ts2dt(ts: dict) -> datetime.datetime: timestamp = datetime.datetime.fromtimestamp( ts["timestamp"]["seconds"], datetime.timezone(datetime.timedelta(minutes=ts["offset"])), ) return timestamp.replace(microsecond=ts["timestamp"]["microseconds"]) def test_provenance_origin_add(provenance, swh_storage_with_objects): """Test the ProvenanceDB.origin_add() method""" for origin in TEST_OBJECTS["origin"]: entry = OriginEntry(url=origin.url, revisions=[]) origin_add(provenance, entry) # TODO: check some facts here def test_provenance_add_revision(provenance, storage_and_CMDBTS, archive_pg): storage, data = storage_and_CMDBTS for i in range(2): # do it twice, there should be no change in results for revision in data["revision"]: entry = RevisionEntry( archive_pg, id=revision["id"], date=ts2dt(revision["date"]), root=revision["directory"], parents=revision["parents"], ) revision_add(provenance, archive_pg, entry) # there should be as many entries in 'revision' as revisions from the # test dataset provenance.cursor.execute("SELECT count(*) FROM revision") assert provenance.cursor.fetchone()[0] == len(data["revision"]) # there should be no 'location' for the empty path provenance.cursor.execute("SELECT count(*) FROM location WHERE path=''") assert provenance.cursor.fetchone()[0] == 0 # there should be 32 'location' for non-empty path provenance.cursor.execute("SELECT count(*) FROM location WHERE path!=''") assert provenance.cursor.fetchone()[0] == 32 # there should be as many entries in 'revision' as revisions from the # test dataset provenance.cursor.execute("SELECT count(*) FROM revision") assert provenance.cursor.fetchone()[0] == len(data["revision"]) # 7 directories provenance.cursor.execute("SELECT count(*) FROM directory") assert provenance.cursor.fetchone()[0] == 7 # 12 D-R entries provenance.cursor.execute("SELECT count(*) FROM directory_in_rev") assert provenance.cursor.fetchone()[0] == 12 provenance.cursor.execute("SELECT count(*) FROM content") assert provenance.cursor.fetchone()[0] == len(data["content"]) provenance.cursor.execute("SELECT count(*) FROM content_in_dir") assert provenance.cursor.fetchone()[0] == 16 provenance.cursor.execute("SELECT count(*) FROM content_early_in_rev") assert provenance.cursor.fetchone()[0] == 13 def test_provenance_content_find_first(provenance, storage_and_CMDBTS, archive_pg): storage, data = storage_and_CMDBTS for revision in data["revision"]: entry = RevisionEntry( archive_pg, id=revision["id"], date=ts2dt(revision["date"]), root=revision["directory"], parents=revision["parents"], ) revision_add(provenance, archive_pg, entry) first_expected_content = [ { "content": "43f3c871310a8e524004e91f033e7fb3b0bc8475", "rev": "35ccb8dd1b53d2d8a5c1375eb513ef2beaa79ae5", "date": 1609757158, "path": "README.md", }, { "content": "6dc7e44ead5c0e300fe94448c3e046dfe33ad4d1", "rev": "9e36e095b79e36a3da104ce272989b39cd68aefd", "date": 1610644094, "path": "Red/Blue/Green/a", }, { "content": "9f6e04be05297905f1275d3f4e0bb0583458b2e8", "rev": "bfbfcc72ae7fc35d6941386c36280512e6b38440", "date": 1610644097, "path": "Red/Blue/Green/b", }, { "content": "a28fa70e725ebda781e772795ca080cd737b823c", "rev": "0a31c9d509783abfd08f9fdfcd3acae20f17dfd0", "date": 1610644099, "path": "Red/Blue/c", }, { "content": "c0229d305adf3edf49f031269a70e3e87665fe88", "rev": "1d1fcf1816a8a2a77f9b1f342ba11d0fe9fd7f17", "date": 1610644105, "path": "Purple/d", }, { "content": "94ba40161084e8b80943accd9d24e1f9dd47189b", "rev": "55d4dc9471de6144f935daf3c38878155ca274d5", "date": 1610644113, "path": ("Dark/Brown/Purple/f", "Dark/Brown/Purple/g", "Dark/h"), # XXX }, { "content": "5e8f9ceaee9dafae2e3210e254fdf170295f8b5b", "rev": "a8939755d0be76cfea136e9e5ebce9bc51c49fef", "date": 1610644116, "path": "Dark/h", }, { "content": "bbd54b961764094b13f10cef733e3725d0a834c3", "rev": "ca1774a07b6e02c1caa7ae678924efa9259ee7c6", "date": 1610644118, "path": "Paris/i", }, { "content": "7ce4fe9a22f589fa1656a752ea371b0ebc2106b1", "rev": "611fe71d75b6ea151b06e3845c09777acc783d82", "date": 1610644120, "path": "Paris/j", }, { "content": "cb79b39935c9392fa5193d9f84a6c35dc9c22c75", "rev": "4c5551b4969eb2160824494d40b8e1f6187fc01e", "date": 1610644122, "path": "Paris/k", }, ] for expected in first_expected_content: contentid = bytes.fromhex(expected["content"]) (blob, rev, date, path) = provenance.content_find_first(contentid) if isinstance(expected["path"], tuple): assert bytes(path).decode() in expected["path"] else: assert bytes(path).decode() == expected["path"] assert bytes(blob) == contentid assert bytes(rev).hex() == expected["rev"] assert int(date.timestamp()) == expected["date"] -def test_provenance_db(provenance, storage_and_CMDBTS, archive_pg): +@pytest.mark.parametrize( + "syntheticfile, args", + ( + ("synthetic_noroot_lower.txt", {"lower": True, "mindepth": 1}), + ("synthetic_noroot_upper.txt", {"lower": False, "mindepth": 1}), + ), +) +def test_provenance_db(provenance, storage_and_CMDBTS, archive_pg, syntheticfile, args): storage, data = storage_and_CMDBTS revisions = {rev["id"]: rev for rev in data["revision"]} rows = { "content": set(), "content_in_dir": set(), "content_early_in_rev": set(), "directory": set(), "directory_in_rev": set(), "location": set(), "revision": set(), } def db_count(table): provenance.cursor.execute(f"SELECT count(*) FROM {table}") return provenance.cursor.fetchone()[0] - for synth_rev in synthetic_result("synthetic_noroot_lower.txt"): + for synth_rev in synthetic_result(syntheticfile): revision = revisions[synth_rev["sha1"]] entry = RevisionEntry( archive_pg, id=revision["id"], date=ts2dt(revision["date"]), root=revision["directory"], parents=revision["parents"], ) - revision_add(provenance, archive_pg, entry) + revision_add(provenance, archive_pg, entry, **args) # each "entry" in the synth file is one new revision rows["revision"].add(synth_rev["sha1"]) assert len(rows["revision"]) == db_count("revision") # this revision might have added new content objects rows["content"] |= set(x["dst"] for x in synth_rev["R_C"]) rows["content"] |= set(x["dst"] for x in synth_rev["D_C"]) assert len(rows["content"]) == db_count("content") # check for R-C (direct) entries rows["content_early_in_rev"] |= set( (x["src"], x["dst"], x["path"]) for x in synth_rev["R_C"] ) assert len(rows["content_early_in_rev"]) == db_count("content_early_in_rev") # check directories rows["directory"] |= set(x["dst"] for x in synth_rev["R_D"]) assert len(rows["directory"]) == db_count("directory") # check for R-D entries rows["directory_in_rev"] |= set( (x["src"], x["dst"], x["path"]) for x in synth_rev["R_D"] ) assert len(rows["directory_in_rev"]) == db_count("directory_in_rev") # check for D-C entries rows["content_in_dir"] |= set( (x["src"], x["dst"], x["path"]) for x in synth_rev["D_C"] ) assert len(rows["content_in_dir"]) == db_count("content_in_dir") # check for location entries rows["location"] |= set(x["path"] for x in synth_rev["R_C"]) rows["location"] |= set(x["path"] for x in synth_rev["D_C"]) rows["location"] |= set(x["path"] for x in synth_rev["R_D"]) assert len(rows["location"]) == db_count("location")