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

save state

Browse Source
This commit is contained in:
chris meyers
2018-11-29 08:53:46 -05:00
parent 09dff99340
commit 916c92ffc7
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/views/__init__.py
View File

@@ -2957,6 +2957,8 @@ class WorkflowJobTemplateNodeChildrenBaseList(WorkflowsEnforcementMixin, Enforce
if parent.id == sub.id: if parent.id == sub.id:
return {"Error": _("Cycle detected.")} return {"Error": _("Cycle detected.")}
if parent.id == sub.id
if WorkflowJobTemplateNode.objects.filter(Q(pk=parent.id) & if WorkflowJobTemplateNode.objects.filter(Q(pk=parent.id) &
Q(success_nodes__in=[sub.id]) | Q(success_nodes__in=[sub.id]) |
Q(failure_nodes__in=[sub.id]) | Q(failure_nodes__in=[sub.id]) |

11
awx/main/tests/functional/api/test_workflow_node.py
View File

@@ -110,6 +110,17 @@ class TestExclusivePathEnforcement():
if index != 0: if index != 0:
assert {'Error': 'Relationship not allowed.'} == json.loads(r.content) assert {'Error': 'Relationship not allowed.'} == json.loads(r.content)
@pytest.mark.parametrize("relationship", ['success', 'failure', 'always']):
def test_existing_relationship_allowed(self, post, admin_user, n1, n2, relationship):
r = post(self.generate_url(path, n1.id),
data={'associate': True, 'id': n2.id},
user=admin_user,
expect=204)
r = post(self.generate_url(path, n1.id),
data={'associate': True, 'id': n2.id},
user=admin_user,
expect=200)
@pytest.mark.django_db @pytest.mark.django_db
class TestNodeCredentials: class TestNodeCredentials: