Merge pull request #5906 from sivel/test-module-json

Support for -a to accept a file with test-module
pull/5910/head
jctanner 11 years ago
commit 4636a0d152

@ -89,6 +89,11 @@ def boilerplate_module(modfile, args, interpreter):
#included_boilerplate = module_data.find(module_common.REPLACER) != -1 or module_data.find("import ansible.module_utils") != -1 #included_boilerplate = module_data.find(module_common.REPLACER) != -1 or module_data.find("import ansible.module_utils") != -1
complex_args = {} complex_args = {}
if args.startswith("@"):
# Argument is a YAML file (JSON is a subset of YAML)
complex_args = utils.combine_vars(complex_args, utils.parse_yaml_from_file(args[1:]))
args=''
inject = {} inject = {}
if interpreter: if interpreter:
if '=' not in interpreter: if '=' not in interpreter:

Loading…
Cancel
Save