External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix bug that broke combining WFJT and node vars

Browse Source
This commit is contained in:
AlanCoding 2017-12-08 13:17:22 -05:00
parent 1c8217936d
commit e59a724efa
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/workflow.py
View File

@ -219,7 +219,7 @@ class WorkflowJobNode(WorkflowNodeBase):
if password_dict:
data['survey_passwords'] = password_dict
# process extra_vars
extra_vars = {}
extra_vars = data.get('extra_vars', {})
if aa_dict:
functional_aa_dict = copy(aa_dict)
functional_aa_dict.pop('_ansible_no_log', None)

6
awx/main/tests/unit/models/test_workflow_unit.py
View File

@ -112,6 +112,7 @@ def workflow_job_template_unit():
def jt_ask(job_template_factory):
# note: factory sets ask_xxxx_on_launch to true for inventory & credential
jt = job_template_factory(name='example-jt', persisted=False).job_template
jt.ask_variables_on_launch = True
jt.ask_job_type_on_launch = True
jt.ask_skip_tags_on_launch = True
jt.ask_limit_on_launch = True
@ -203,11 +204,12 @@ class TestWorkflowJobNodeJobKWARGS:
def test_null_kwargs(self, job_node_no_prompts):
assert job_node_no_prompts.get_job_kwargs() == self.kwargs_base
def test_inherit_workflow_job_extra_vars(self, job_node_no_prompts):
def test_inherit_workflow_job_and_node_extra_vars(self, job_node_no_prompts):
job_node_no_prompts.extra_data = {"b": 98}
workflow_job = job_node_no_prompts.workflow_job
workflow_job.extra_vars = '{"a": 84}'
assert job_node_no_prompts.get_job_kwargs() == dict(
extra_vars={'a': 84}, **self.kwargs_base)
extra_vars={'a': 84, 'b': 98}, **self.kwargs_base)
def test_char_prompts_and_res_node_prompts(self, job_node_with_prompts):
# TBD: properly handle multicred credential assignment