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
This commit is contained in:
Pilou 2018-03-29 19:54:48 +02:00 committed by ansibot
parent e10724fadb
commit 7908f78fa6
4 changed files with 8 additions and 6 deletions

View file

@ -28,8 +28,8 @@ def fake_old_module_open(mocker):
mocker.patch('builtins.open', m)
def test_shebang(fake_old_module_open):
(data, style, shebang) = modify_module('fake_module', 'fake_path', {})
def test_shebang(fake_old_module_open, templar):
(data, style, shebang) = modify_module('fake_module', 'fake_path', {}, templar)
assert shebang == '#!/usr/bin/python'
@ -38,5 +38,5 @@ def test_shebang_task_vars(fake_old_module_open, templar):
'ansible_python_interpreter': '/usr/bin/python3'
}
(data, style, shebang) = modify_module('fake_module', 'fake_path', {}, task_vars=task_vars, templar=templar)
(data, style, shebang) = modify_module('fake_module', 'fake_path', {}, templar, task_vars=task_vars)
assert shebang == '#!/usr/bin/python3'