Page MenuHomeSoftware Heritage
Files F9312672

D8226.id29673.diff
No OneTemporary
Actions

D8226.id29673.diff
View Options

diff --git a/docker/tests/test_vault.py b/docker/tests/test_vault.py
--- a/docker/tests/test_vault.py
+++ b/docker/tests/test_vault.py
@@ -20,26 +20,26 @@
rev_id = snapshot["branches"]["refs/heads/master"]["target"]
revision = apiget(f"revision/{rev_id}")
dir_id = revision["directory"]
- dir_swhid = f"swh:1:dir:{dir_id}"
+ swhid = f"swh:1:dir:{dir_id}"
# now cook it
- cook = apiget(f"vault/flat/{dir_swhid}/", "POST")
- assert cook["swhid"] == dir_swhid
- assert cook["fetch_url"].endswith(f"vault/flat/{dir_swhid}/raw/")
+ cook = apiget(f"vault/flat/{swhid}/", "POST")
+ assert cook["swhid"] == swhid
+ assert cook["fetch_url"].endswith(f"vault/flat/{swhid}/raw/")
# while it's cooking, get the directory tree from the archive
directory = getdirectory(dir_id)
# retrieve the cooked tar file
- resp = pollapi(f"vault/flat/{dir_swhid}/raw")
+ resp = pollapi(f"vault/flat/{swhid}/raw")
tarf = tarfile.open(fileobj=io.BytesIO(resp.content))
# and check the tarfile seems ok wrt. 'directory'
- assert tarf.getnames()[0] == dir_swhid
+ assert tarf.getnames()[0] == swhid
tarfiles = {t.name: t for t in tarf.getmembers()}
for fname, fdesc in directory:
- tfinfo = tarfiles.get(join(dir_swhid, fname))
+ tfinfo = tarfiles.get(join(swhid, fname))
assert tfinfo, f"Missing path {fname} in retrieved tarfile"
if fdesc["type"] == "file":
if tfinfo.issym():
@@ -57,11 +57,79 @@
assert (
hash == fdesc["checksums"][algo]
), f"File {fname}: {algo} mismatch"
- # XXX what to check for dir? symlink? (other?)
+ # XXX what to check for dir or rev?
# check that if we ask a second time this directory, it returns the same
# and does not cook it again
- recook = apiget(f"vault/flat/{dir_swhid}/", "POST")
- assert recook["swhid"] == dir_swhid
+ recook = apiget(f"vault/flat/{swhid}/", "POST")
+ assert recook["swhid"] == swhid
+ assert recook["id"] == cook["id"]
+ assert recook["status"] == "done" # no need to wait for this to be true
+
+
+def test_vault_git_bare(host, scheduler_host, git_origin, tmp_path, monkeypatch):
+ # retrieve the revision of the master branch of the ingested git
+ # repository (by the git_origin fixture)
+ visit = apiget(f"origin/{quote_plus(git_origin)}/visit/latest")
+ snapshot = apiget(f'snapshot/{visit["snapshot"]}')
+ rev_id = snapshot["branches"]["refs/heads/master"]["target"]
+ swhid = f"swh:1:rev:{rev_id}"
+ revision = apiget(f"revision/{rev_id}")
+ dir_id = revision["directory"]
+
+ # now cook it
+ cook = apiget(f"vault/git-bare/{swhid}/", "POST")
+ assert cook["swhid"] == swhid
+ assert cook["fetch_url"].endswith(f"vault/git-bare/{swhid}/raw/")
+
+ # while it's cooking, get the directory tree from the archive
+ directory = getdirectory(dir_id)
+
+ # retrieve the cooked tar file
+ resp = pollapi(f"vault/git-bare/{swhid}/raw")
+ tarf = tarfile.open(fileobj=io.BytesIO(resp.content))
+ assert tarf.getnames()[0] == f"{swhid}.git"
+
+ # extract it in a tmp file and attempt to git clone it
+ tarf.extractall(path=tmp_path)
+ repo = tmp_path / "repo"
+ host.run_test(f"git clone {tmp_path/swhid}.git {repo}")
+ # check a few basic git stuff
+ host.check_output(f"git -C {repo} branch") == "* master"
+ host.check_output(f"git -C {repo} rev-parse HEAD") == rev_id
+ host.run_test(f"git -C {repo} log")
+
+ # check the working direcoty matches dir_id content from the archive
+ for fname, fdesc in directory:
+ if fdesc["type"] == "file":
+ assert (repo / fname).is_file()
+ if fdesc["perms"] == 0o120000:
+ # it's a symlink; see DentryPerms in swh.model
+ fdata = bytes((repo / fname).readlink())
+ else:
+ # it's an actual file
+ fdata = (repo / fname).read_bytes()
+ for algo in fdesc["checksums"]:
+ if algo not in hashlib.algorithms_available:
+ continue
+ hash = hashlib.new(algo, fdata).hexdigest()
+ if hash != fdesc["checksums"][algo]:
+ breakpoint()
+ assert (
+ hash == fdesc["checksums"][algo]
+ ), f"File {fname}: {algo} mismatch"
+ elif fdesc["type"] == "dir":
+ assert (repo / fname).is_dir()
+ elif fdesc["type"] == "rev":
+ # TODO
+ pass
+ else:
+ assert False, (
+ f"Unexpected directory entry type {fdesc['type']} from {fdesc}")
+
+ # check that if we ask a second time this directory, it returns the same
+ # and does not cook it again
+ recook = apiget(f"vault/git-bare/{swhid}/", "POST")
+ assert recook["swhid"] == swhid
assert recook["id"] == cook["id"]
assert recook["status"] == "done" # no need to wait for this to be true

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 2, 11:02 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3228022

Event Timeline

About · Developer information · Legal