8 Commits (stable-2.5)

Author	SHA1	Message	Date
Pilou	5fc9f3d219	module_common: handle None value for templar (#36651) ... * module_common: set required parameter templar Fix the following error (related to b455901): $ ./hacking/test-module -m ./lib/ansible/modules/system/ping.py -I ansible_python_interpreter=/usr/bin/python Traceback (most recent call last): File "./hacking/test-module", line 268, in <module> main() File "./hacking/test-module", line 249, in main (modfile, modname, module_style) = boilerplate_module(options.module_path, options.module_args, interpreters, options.check, options.filename) File "./hacking/test-module", line 152, in boilerplate_module task_vars=task_vars File "ansible/lib/ansible/executor/module_common.py", line 910, in modify_module environment=environment) File "ansible/lib/ansible/executor/module_common.py", line 736, in _find_module_utils shebang, interpreter = _get_shebang(u'/usr/bin/python', task_vars, templar) File "ansible/lib/ansible/executor/module_common.py", line 452, in _get_shebang interpreter = templar.template(task_vars[interpreter_config].strip()) AttributeError: 'NoneType' object has no attribute 'template' * module_common.modify_module: templar is required (cherry picked from commit 7908f78fa6)	8 years ago
Matt Martz	9bd7147bb8	Start of tests for modify_module, specifically to ensure proper shebang replacement on old style modules (#36602) (#36606) ... (cherry picked from commit a7062b7587)	8 years ago
Toshio Kuratomi	b455901904	Fix shebang. shebang and interpreter path weren't being templated (#33698) ... * Fix shebang. shebang and interpreter path weren't being templated Fixes #18665 Fixes #33696	9 years ago
Toshio Kuratomi	9f7b0dfc30	Remove automatic use of system six ... * Enable the pylint no-name-in-module check. Checks that identifiers in imports actually exist. When we do this, we also have to ignore _MovedItems used in our bundled six. This means pylint won't check for bad imports below ansible.module_utils.six.moves but that's something that pylint punts on with a system copy of six so this is still an improvement. * Remove automatic use of system six. The exec in the six code which tried to use a system library if available destroyed pylint's ability to check for imports of identifiers which did not exist (the no-name-in-module check). That test is important enough that we should sacrifice the bundling detection in favour of the test. Distributions that want to unbundle six can replace the bundled six in ansible/module_utils/six/__init__.py to unbundle. however, be aware that six is tricky to unbundle. They may want to base their efforts off the code we were using: 2fff690caa/lib/ansible/module_utils/six/__init__.py * Update tests for new location of bundled six Several code-smell tests whitelist the bundled six library. Update the path to the library so that they work. * Also check for basestring in modules as the enabled pylint tests will also point out basestring usage for us.	9 years ago
Dag Wieers	4efec414e7	test/: PEP8 compliancy (#24803) ... * test/: PEP8 compliancy - Make PEP8 compliant * Python3 chokes on casting int to bytes (#24952) But if we tell the formatter that the var is a number, it works	9 years ago
Toshio Kuratomi	2fff690caa	Update module_utils.six to latest (#22855) ... * Update module_utils.six to latest We've been held back on the version of six we could use on the module side to 1.4.x because of python-2.4 compatibility. Now that our minimum is Python-2.6, we can update to the latest version of six in module_utils and get rid of the second copy in lib/ansible/compat.	9 years ago
Toshio Kuratomi	5c38f3cea2	Combine jimi-c and bcoca's ideas and work on hooking module-utils into PluginLoader. ... This version just gets the relevant paths from PluginLoader and then uses the existing imp.find_plugin() calls in the AnsiballZ code to load the proper module_utils. Modify PluginLoader to optionally omit subdirectories (module_utils needs to operate on top level dirs, not on subdirs because it has a hierarchical namespace whereas all other plugins use a flat namespace). Rename snippet* variables to module_utils* Add a small number of unittests for recursive_finder Add a larger number of integration tests to demonstrate that module_utils is working. Whitelist module-style shebang in test target library dirs Prefix module_data variable with b_ to be clear that it holds bytes data	9 years ago
Toshio Kuratomi	1609afbd12	Unittests for some of module_common.py (#20812) ... * Unittests for some of module_common.py * Port test_run_command to use pytest-mock The use of addCleanup(patch.stopall) from the unittest idiom was conflicting with the pytest-mock idiom of closing all patches automatically. Switching to pytest-mock ensures that the patches are closed and removing the stopall stops the conflict.	9 years ago