zuul
/
zuul
Code Issues Proposed changes

Merge "Generate symlinks during tests"

This commit is contained in:
Zuul 2018-03-16 02:54:39 +00:00 committed by Gerrit Code Review
parent 7510cf2973 fac4a31df3
commit cb4b10f517
15 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/base.py
View File

@ -2407,24 +2407,19 @@ class ZuulTestCase(BaseTestCase):
files = {}
for (dirpath, dirnames, filenames) in os.walk(source_path):
# Note: In case a symlink points to an already existing directory
# os.walk includes that in the dirnames list. In order to properly
# copy these links, just add them to the filenames list.
for dirname in dirnames:
test_tree_filepath = os.path.join(dirpath, dirname)
if os.path.islink(test_tree_filepath):
filenames.append(dirname)
for filename in filenames:
test_tree_filepath = os.path.join(dirpath, filename)
common_path = os.path.commonprefix([test_tree_filepath,
source_path])
relative_filepath = test_tree_filepath[len(common_path) + 1:]
if os.path.islink(test_tree_filepath):
content = SymLink(os.readlink(test_tree_filepath))
else:
with open(test_tree_filepath, 'rb') as f:
content = f.read()
with open(test_tree_filepath, 'rb') as f:
content = f.read()
# dynamically create symlinks if the content is of the form
# symlink: <target>
match = re.match(b'symlink: ([^\s]+)', content)
if match:
content = SymLink(match.group(1))
files[relative_filepath] = content
self.addCommitToRepo(project, 'add content from fixture',
files, branch='master', tag='init')

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir-symlink/one vendored
View File

@ -1 +0,0 @@
/opt/file

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/dir-symlink/one vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/file

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/symlink vendored
View File

@ -1 +0,0 @@
/opt/assemble

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/assemble-test/files/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/assemble

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/dir-symlink/symlink vendored
View File

@ -1 +0,0 @@
/opt/dir

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/dir-symlink/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/dir

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/symlink vendored
View File

@ -1 +0,0 @@
/opt/file

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/copy-test/files/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/file

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/symlink.yaml vendored
View File

@ -1 +0,0 @@
/opt/vars.yaml

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevars-test/vars/symlink.yaml vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/vars.yaml

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/double-symlink-sidekick vendored
View File

@ -1 +0,0 @@
../double-symlink-sidekick

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-double-symlink/double-symlink-sidekick vendored Normal file
View File

@ -0,0 +1 @@
symlink: ../double-symlink-sidekick

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/two.yaml vendored
View File

@ -1 +0,0 @@
/opt/vars.yaml

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir-symlink/two.yaml vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/vars.yaml

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/sub/recursive-link vendored
View File

@ -1 +0,0 @@
..

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/dir/sub/recursive-link vendored Normal file
View File

@ -0,0 +1 @@
symlink: ..

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/double-symlink-sidekick/vars.yaml vendored
View File

@ -1 +0,0 @@
/opt/vars.yaml

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/double-symlink-sidekick/vars.yaml vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/vars.yaml

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/symlink vendored
View File

@ -1 +0,0 @@
/opt/vars

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/includevarsdir-test/vars/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/vars

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/symlink vendored
View File

@ -1 +0,0 @@
/opt/patch

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/patch-test/files/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/patch

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/symlink vendored
View File

@ -1 +0,0 @@
/opt/script.sh

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/script-test/files/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/script.sh

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/symlink vendored
View File

@ -1 +0,0 @@
/opt/file

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/template-test/templates/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/file

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/symlink vendored
View File

@ -1 +0,0 @@
/opt/archive.tar

1
tests/fixtures/config/remote-action-modules/git/org_project/playbooks/roles/unarchive-test/files/symlink vendored Normal file
View File

@ -0,0 +1 @@
symlink: /opt/archive.tar