External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from ansible/devel

Browse Source 
Rebase
This commit is contained in:
Sean Sullivan
2020-11-10 08:13:52 -06:00
committed by GitHub
parent 1ca46893bb d16055806b
commit 0fd0f0c1bd
284 changed files with 9133 additions and 4349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx_collection/test/awx/test_completeness.py
View File

@@ -44,8 +44,8 @@ no_api_parameter_ok = {
# We take an organization here to help with the lookups only
'tower_job_template': ['survey_spec', 'organization'],
'tower_inventory_source': ['organization'],
# Organization is how we are looking up job templates
'tower_workflow_job_template_node': ['organization'],
# Organization is how we are looking up job templates, Approval node is for workflow_approval_templates
'tower_workflow_job_template_node': ['organization', 'approval_node'],
# Survey is how we handle associations
'tower_workflow_job_template': ['survey'],
# ad hoc commands support interval and timeout since its more like tower_job_launc

17
awx_collection/test/awx/test_workflow_job_template_node.py
View File

@@ -4,7 +4,7 @@ __metaclass__ = type
import pytest
from awx.main.models import WorkflowJobTemplateNode, WorkflowJobTemplate, JobTemplate
from awx.main.models import WorkflowJobTemplateNode, WorkflowJobTemplate, JobTemplate, UnifiedJobTemplate
@pytest.fixture
@@ -53,27 +53,26 @@ def test_create_workflow_job_template_node(run_module, admin_user, wfjt, job_tem
@pytest.mark.django_db
def test_create_workflow_job_template_node_no_template(run_module, admin_user, wfjt, job_template):
"""This is a part of the API contract for creating approval nodes
and at some point in the future, tha feature will be supported by the collection
"""
def test_create_workflow_job_template_node_approval_node(run_module, admin_user, wfjt, job_template):
"""This is a part of the API contract for creating approval nodes"""
this_identifier = '42🐉'
result = run_module('tower_workflow_job_template_node', {
'identifier': this_identifier,
'workflow_job_template': wfjt.name,
'organization': wfjt.organization.name,
'approval_node': {'name': 'foo-jt-approval'}
}, admin_user)
assert not result.get('failed', False), result.get('msg', result)
assert result.get('changed', False), result
node = WorkflowJobTemplateNode.objects.get(pk=result['id'])
# node = WorkflowJobTemplateNode.objects.first()
node = WorkflowJobTemplateNode.objects.get(identifier=this_identifier)
approval_node = UnifiedJobTemplate.objects.get(name='foo-jt-approval')
assert result['id'] == node.id
assert result['id'] == approval_node.id
assert node.identifier == this_identifier
assert node.workflow_job_template_id == wfjt.id
assert node.unified_job_template_id is None
assert node.unified_job_template_id is approval_node.id
@pytest.mark.django_db