From 194c2dcf0b93a10484ee9b7bde9feae5ec1b5b88 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 12 Feb 2018 10:14:37 -0500 Subject: [PATCH] improve a bwrap test --- awx/main/tests/unit/test_tasks.py | 6 +++++- awx/main/utils/common.py | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index 34542eb9e1..f2a1617b8f 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -1392,7 +1392,11 @@ class TestProjectUpdateCredentials(TestJobExecution): args, cwd, env, stdout = args extra_vars = parse_extra_vars(args) 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) return ['successful', 0] diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 3de02e62a6..47d1c424b4 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -803,8 +803,6 @@ def wrap_args_with_proot(args, cwd, **kwargs): if not os.path.exists(path): continue 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,)]) if kwargs.get('isolated'): if 'ansible-playbook' in args: