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

fix bug scheduling WFJT without prompts

Browse Source
This commit is contained in:
AlanCoding 2018-02-07 14:34:25 -05:00
parent 244dfa1c92
commit fe69a23a4e
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,7 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio
copy_m2m_relationships(self, unified_jt, fields)
return unified_jt
def _accept_or_ignore_job_kwargs(self, _exclude_errors=None, **kwargs):
def _accept_or_ignore_job_kwargs(self, _exclude_errors=(), **kwargs):
'''
Override in subclass if template accepts _any_ prompted params
'''

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

@ -353,7 +353,7 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
workflow_job.copy_nodes_from_original(original=self)
return workflow_job
def _accept_or_ignore_job_kwargs(self, **kwargs):
def _accept_or_ignore_job_kwargs(self, _exclude_errors=(), **kwargs):
prompted_fields = {}
rejected_fields = {}
accepted_vars, rejected_vars, errors_dict = self.accept_or_ignore_variables(kwargs.get('extra_vars', {}))

6
awx/main/tests/functional/api/test_schedules.py
View File

@ -27,6 +27,12 @@ def test_non_job_extra_vars_prohibited(post, project, admin_user):
assert 'not allowed on launch' in str(r.data['extra_data'][0])
@pytest.mark.django_db
def test_wfjt_schedule_accepted(post, workflow_job_template, admin_user):
url = reverse('api:workflow_job_template_schedules_list', kwargs={'pk': workflow_job_template.id})
post(url, {'name': 'test sch', 'rrule': RRULE_EXAMPLE}, admin_user, expect=201)
@pytest.mark.django_db
def test_valid_survey_answer(post, admin_user, project, inventory, survey_spec_factory):
job_template = JobTemplate.objects.create(