wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make test-module use default value for interpreter (#54053)

Browse source 
* Make test-module use default value for interpreter

* Changing from static interpreter path to sys.executable as per #54053

* A little ntegration test for #54053
This commit is contained in:
Karolis Tamutis 2019-04-10 17:04:49 +03:00 committed by Matt Martz
parent d3dae4a444
commit 54384e7a12
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hacking/test-module
View file

@ -64,7 +64,8 @@ def parse():
help="path to python debugger (e.g. /usr/bin/pdb)")
parser.add_option('-I', '--interpreter', dest='interpreter',
help="path to interpreter to use for this module (e.g. ansible_python_interpreter=/usr/bin/python)",
metavar='INTERPRETER_TYPE=INTERPRETER_PATH')
metavar='INTERPRETER_TYPE=INTERPRETER_PATH',
default="ansible_python_interpreter=%s" % (sys.executable if sys.executable else '/usr/bin/python'))
parser.add_option('-c', '--check', dest='check', action='store_true',
help="run the module in check mode")
parser.add_option('-n', '--noexecute', dest='execute', action='store_false',

6
test/integration/targets/test_infra/runme.sh
View file

@ -24,8 +24,12 @@ echo "$PB_OUT" | grep -F "assert works (True)" || exit 1
set -e
# ensure test-module script works well
PING_MODULE_PATH="../../../../lib/ansible/modules/system/ping.py"
# ensure test-module script works without passing Python interpreter path
../../../../hacking/test-module -m "$PING_MODULE_PATH"
# ensure test-module script works well
../../../../hacking/test-module -m "$PING_MODULE_PATH" -I ansible_python_interpreter="$(which python)"
# ensure module.ansible_version is defined when using test-module