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

Fix ansible-test invocation of pytest.

Browse source 
(cherry picked from commit 1939f6c412)
This commit is contained in:
Matt Clay 2018-10-31 19:49:48 -07:00
parent 67c75af4fe
commit 0812b87def
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/runner/injector/injector.py
View file

@ -151,14 +151,22 @@ def injector():
:rtype: list[str], dict[str, str] :rtype: list[str], dict[str, str]
""" """
command = os.path.basename(__file__) command = os.path.basename(__file__)
executable = find_executable(command)
run_as_python_module = (
'pytest',
)
if command in run_as_python_module:
executable_args = ['-m', command]
else:
executable_args = [find_executable(command)]
if config.coverage_file: if config.coverage_file:
args, env = coverage_command() args, env = coverage_command()
else: else:
args, env = [config.python_interpreter], os.environ.copy() args, env = [config.python_interpreter], os.environ.copy()
args += [executable] args += executable_args
if command in ('ansible', 'ansible-playbook', 'ansible-pull'): if command in ('ansible', 'ansible-playbook', 'ansible-pull'):
if config.remote_interpreter is None: if config.remote_interpreter is None: