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

Fix ansible-test payload bin creation.

Browse source
This commit is contained in:
Matt Clay 2019-08-21 12:12:52 -07:00
parent 3cd7182796
commit 3551d83289
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/lib/ansible_test/_internal/payload.py
View file

@ -4,6 +4,7 @@ __metaclass__ = type
import atexit import atexit
import os import os
import stat
import tarfile import tarfile
import tempfile import tempfile
import time import time
@ -57,10 +58,17 @@ def create_payload(args, dst_path): # type: (CommonConfig, str) -> None
return return
files = list(data_context().ansible_source) files = list(data_context().ansible_source)
filters = {}
def make_executable(tar_info): # type: (tarfile.TarInfo) -> t.Optional[tarfile.TarInfo]
"""Make the given file executable."""
tar_info.mode |= stat.S_IXUSR | stat.S_IXOTH | stat.S_IXGRP
return tar_info
if not ANSIBLE_SOURCE_ROOT: if not ANSIBLE_SOURCE_ROOT:
# reconstruct the bin directory which is not available when running from an ansible install # reconstruct the bin directory which is not available when running from an ansible install
files.extend(create_temporary_bin_files(args)) files.extend(create_temporary_bin_files(args))
filters.update(dict((path[3:], make_executable) for path in ANSIBLE_BIN_SYMLINK_MAP.values() if path.startswith('../')))
if not data_context().content.is_ansible: if not data_context().content.is_ansible:
# exclude unnecessary files when not testing ansible itself # exclude unnecessary files when not testing ansible itself
@ -91,7 +99,7 @@ def create_payload(args, dst_path): # type: (CommonConfig, str) -> None
with tarfile.TarFile.gzopen(dst_path, mode='w', compresslevel=4) as tar: with tarfile.TarFile.gzopen(dst_path, mode='w', compresslevel=4) as tar:
for src, dst in files: for src, dst in files:
display.info('%s -> %s' % (src, dst), verbosity=4) display.info('%s -> %s' % (src, dst), verbosity=4)
tar.add(src, dst) tar.add(src, dst, filter=filters.get(dst))
duration = time.time() - start duration = time.time() - start
payload_size_bytes = os.path.getsize(dst_path) payload_size_bytes = os.path.getsize(dst_path)