External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-07 02:59:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Unit test added.

Browse Source
This commit is contained in:
Aaron Tan
2017-03-16 11:08:19 -04:00
parent 95e41e078c
commit 90bcc3d6ab
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/models/jobs.py
View File

@@ -311,9 +311,8 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
variables_needed = True variables_needed = True
prompting_needed = False prompting_needed = False
for key, value in self._ask_for_vars_dict().iteritems(): for key, value in self._ask_for_vars_dict().iteritems():
if value and not (key == 'extra_vars' if value and not (key == 'extra_vars' and
and callback_extra_vars is not None callback_extra_vars is not None):
and not variables_needed):
prompting_needed = True prompting_needed = True
return (not prompting_needed and return (not prompting_needed and
not self.passwords_needed_to_start and not self.passwords_needed_to_start and

13
awx/main/tests/unit/models/test_job_template_unit.py
View File

@@ -115,3 +115,16 @@ def test_job_template_survey_mixin_length(job_template_factory):
{'type':'password', 'variable':'my_other_variable'}]} {'type':'password', 'variable':'my_other_variable'}]}
kwargs = obj._update_unified_job_kwargs(extra_vars={'my_variable':'$encrypted$'}) kwargs = obj._update_unified_job_kwargs(extra_vars={'my_variable':'$encrypted$'})
assert kwargs['extra_vars'] == '{"my_variable": "my_default"}' assert kwargs['extra_vars'] == '{"my_variable": "my_default"}'
def test_job_template_can_start_with_callback_extra_vars_provided(job_template_factory):
objects = job_template_factory(
'callback_extra_vars_test',
organization='org1',
inventory='inventory1',
credential='cred1',
persisted=False,
)
obj = objects.job_template
obj.ask_variables_on_launch = True
assert obj.can_start_without_user_input(callback_extra_vars='{"foo": "bar"}') is True