zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-17 18:48:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

unit test for node prompt values

Browse Source
This commit is contained in:
AlanCoding
2016-09-27 09:17:51 -04:00
parent 1604e2fd02
commit 549273e90f
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/models/workflow.py
+2 -2
View File
@@ -27,7 +27,7 @@ import json
__all__ = ['WorkflowJobTemplate', 'WorkflowJob', 'WorkflowJobOptions', 'WorkflowJobNode', 'WorkflowJobTemplateNode',]
CHAR_PROMPTS_LIST = ['job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags']
CHAR_PROMPTS_LIST = ['job_type', 'job_tags', 'skip_tags', 'limit']
class WorkflowNodeBase(CreatedModifiedModel):
class Meta:
@@ -173,7 +173,7 @@ class WorkflowJobNode(WorkflowNodeBase):
WJ_json_extra_vars = yaml.safe_load(self.workflow_job.extra_vars)
except yaml.YAMLError:
WJ_json_extra_vars = {}
extra_vars.update(WJ_json_extra_vars)
extra_vars.update(WJ_json_extra_vars)
# TODO: merge artifacts, add ancestor_artifacts to kwargs
if extra_vars:
data['extra_vars'] = extra_vars