You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by ro...@apache.org on 2020/12/29 13:38:51 UTC
[buildstream] 20/20: import_cas.py: Tidyup
This is an automated email from the ASF dual-hosted git repository.
root pushed a commit to branch jmac/virtual_directory_tests
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 252aba3508b16380e8b4100fb7881a8942285503
Author: Jim MacArthur <ji...@codethink.co.uk>
AuthorDate: Thu Sep 20 18:27:05 2018 +0100
import_cas.py: Tidyup
---
tests/storage/import_cas.py | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/tests/storage/import_cas.py b/tests/storage/import_cas.py
index 8776647..6b091cc 100644
--- a/tests/storage/import_cas.py
+++ b/tests/storage/import_cas.py
@@ -72,16 +72,16 @@ def combinations(integer_range):
def resolve_symlinks(path, root):
- """ A function to resolve symlinks which are rooted at 'root'. For example, the symlink
-
- /a/b/c/d -> /c/e
-
- should resolve with the call resolve_symlinks('/a/b/c/d', '/a/b') to '/a/b/c/e'.
+ """ A function to resolve symlinks inside 'path' components apart from the last one.
+ For example, resolve_symlinks('/a/b/c/d', '/a/b')
+ will return '/a/b/f/d' if /a/b/c is a symlink to /a/b/f. The final component of
+ 'path' is not resolved, because we typically want to inspect the symlink found
+ at that path, not its target.
"""
components = path.split(os.path.sep)
location = root
- for i in range(0, len(components)):
+ for i in range(0, len(components) - 1):
location = os.path.join(location, components[i])
if os.path.islink(location):
# Resolve the link, add on all the remaining components
@@ -95,9 +95,15 @@ def resolve_symlinks(path, root):
# Relative link - relative to symlink location
location = os.path.join(location, target)
return resolve_symlinks(location, root)
+ # If we got here, no symlinks were found. Add on the final component and return.
+ location = os.path.join(location, components[-1])
return location
+def directory_not_empty(path):
+ return os.listdir(path)
+
+
@pytest.mark.parametrize("original,overlay", combinations([1, 2, 3, 4, 5]))
def test_cas_import(cli, tmpdir, original, overlay):
print("Testing import of root {} into root {}".format(overlay, original))
@@ -116,15 +122,19 @@ def test_cas_import(cli, tmpdir, original, overlay):
realpath = resolve_symlinks(path, os.path.join(tmpdir, "output"))
print("resolved {} to {}".format(path, realpath))
if typename == 'F':
- assert os.path.isfile(realpath), "{} did not exist in the combined virtual directory".format(path)
- # Problem here - symlinks won't resolve because the root is incorrect.
- assert file_contents_are(realpath, content)
+ if os.path.isdir(realpath) and directory_not_empty(realpath):
+ # The file should not have overwritten the directory in this case.
+ pass
+ else:
+ assert os.path.isfile(realpath), "{} did not exist in the combined virtual directory".format(path)
+ assert file_contents_are(realpath, content)
elif typename == 'S':
- # Not currently verified.
- # assert os.path.islink(os.path.join(tmpdir, "output", path)),
- # "{} did not exist in the combined virtual directory".format(path)
- # assert os.readlink(os.path.join(tmpdir, "output", path)) == content
- pass
+ if os.path.isdir(realpath) and directory_not_empty(realpath):
+ # The symlink should not have overwritten the directory in this case.
+ pass
+ else:
+ assert os.path.islink(realpath)
+ assert os.readlink(realpath) == content
elif typename == 'D':
# Note that isdir accepts symlinks to dirs, so a symlink to a dir is acceptable.
assert os.path.isdir(realpath)