cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Correct ansible-test injector python behavior.

Browse source 
Inject a symlink to the correct python into the copied injector
directory instead of altering the shebang of the injector. This
has the side-effect of also intercepting `python` for integration
tests which simplifies cases where it needs to be directly invoked
without collecting code coverage.

(cherry picked from commit d6bf45cd9d)
This commit is contained in:
Matt Clay 2018-11-14 11:03:24 -08:00 committed by Toshio Kuratomi
parent 177160d216
commit 6dca1d7784
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/runner/lib/util.py
View file

@ -248,15 +248,6 @@ def get_coverage_path(args, version, interpreter):
shutil.copytree(src, os.path.join(coverage_path, 'coverage')) shutil.copytree(src, os.path.join(coverage_path, 'coverage'))
shutil.copy('.coveragerc', os.path.join(coverage_path, 'coverage', '.coveragerc')) shutil.copy('.coveragerc', os.path.join(coverage_path, 'coverage', '.coveragerc'))
injector = os.path.join(coverage_path, 'coverage', 'injector.py')
with open(injector, 'r+') as injector_fd:
code = injector_fd.read()
code = re.sub(r'^#!.*', '#!%s' % interpreter, code, count=1)
injector_fd.seek(0)
injector_fd.write(code)
injector_fd.truncate()
for root, dir_names, file_names in os.walk(coverage_path): for root, dir_names, file_names in os.walk(coverage_path):
for name in dir_names + file_names: for name in dir_names + file_names:
os.chmod(os.path.join(root, name), stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) os.chmod(os.path.join(root, name), stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
@ -265,6 +256,8 @@ def get_coverage_path(args, version, interpreter):
os.mkdir(os.path.join(coverage_path, directory)) os.mkdir(os.path.join(coverage_path, directory))
os.chmod(os.path.join(coverage_path, directory), stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) os.chmod(os.path.join(coverage_path, directory), stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
os.symlink(interpreter, os.path.join(coverage_path, 'coverage', 'python'))
if not COVERAGE_PATHS: if not COVERAGE_PATHS:
atexit.register(cleanup_coverage_dirs) atexit.register(cleanup_coverage_dirs)