External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-25 21:05:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

improve a bwrap test

Browse Source
This commit is contained in:
Ryan Petrello
2018-02-12 10:14:37 -05:00
parent b38be89d1a
commit 194c2dcf0b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tests/unit/test_tasks.py
View File

@@ -1392,7 +1392,11 @@ class TestProjectUpdateCredentials(TestJobExecution):
args, cwd, env, stdout = args args, cwd, env, stdout = args
extra_vars = parse_extra_vars(args) extra_vars = parse_extra_vars(args)
assert ' '.join(args).startswith('bwrap') assert ' '.join(args).startswith('bwrap')
assert ' '.join(['--bind', settings.PROJECTS_ROOT, settings.PROJECTS_ROOT]) in ' '.join(args) assert ' '.join([
'--bind',
os.path.realpath(settings.PROJECTS_ROOT),
os.path.realpath(settings.PROJECTS_ROOT)
]) in ' '.join(args)
assert extra_vars["scm_revision_output"].startswith(settings.PROJECTS_ROOT) assert extra_vars["scm_revision_output"].startswith(settings.PROJECTS_ROOT)
return ['successful', 0] return ['successful', 0]

2
awx/main/utils/common.py
View File

@@ -803,8 +803,6 @@ def wrap_args_with_proot(args, cwd, **kwargs):
if not os.path.exists(path): if not os.path.exists(path):
continue continue
path = os.path.realpath(path) path = os.path.realpath(path)
if os.path.isdir(path):
path = os.path.join(path, '') # add a trailing slash
new_args.extend(['--bind', '%s' % (path,), '%s' % (path,)]) new_args.extend(['--bind', '%s' % (path,), '%s' % (path,)])
if kwargs.get('isolated'): if kwargs.get('isolated'):
if 'ansible-playbook' in args: if 'ansible-playbook' in args: