Release unified UJT unique_together constraint.

awx/main/tests/functional/api/test_inventory.py

@@ -1,6 +1,8 @@
 import pytest
 import mock
 
+from django.core.exceptions import ValidationError
+
 from awx.api.versioning import reverse
 
 from awx.main.models import InventorySource, Project, ProjectUpdate
@@ -34,6 +36,19 @@ def test_inventory_source_notification_on_cloud_only(get, post, inventory_source
     assert response.status_code == 400
 
 
+@pytest.mark.django_db
+def test_inventory_source_unique_together_with_inv(inventory_factory):
+    inv1 = inventory_factory('foo')
+    inv2 = inventory_factory('bar')
+    is1 = InventorySource(name='foo', source='file', inventory=inv1)
+    is1.save()
+    is2 = InventorySource(name='foo', source='file', inventory=inv1)
+    with pytest.raises(ValidationError):
+        is2.validate_unique()
+    is2 = InventorySource(name='foo', source='file', inventory=inv2)
+    is2.validate_unique()
+
+
 @pytest.mark.parametrize("role_field,expected_status_code", [
     (None, 403),
     ('admin_role', 200),
@@ -347,4 +362,3 @@ class TestInsightsCredential:
         patch(insights_inventory.get_absolute_url(),
               {'insights_credential': scm_credential.id}, admin_user,
               expect=400)
-

awx/main/tests/functional/models/test_workflow.py

@@ -3,13 +3,14 @@
 import pytest
 
 # AWX
-from awx.main.models.workflow import WorkflowJob, WorkflowJobNode, WorkflowJobTemplateNode
+from awx.main.models.workflow import WorkflowJob, WorkflowJobNode, WorkflowJobTemplateNode, WorkflowJobTemplate
 from awx.main.models.jobs import Job
 from awx.main.models.projects import ProjectUpdate
 from awx.main.scheduler.dag_workflow import WorkflowDAG
 
 # Django
 from django.test import TransactionTestCase
+from django.core.exceptions import ValidationError
 
 
 @pytest.mark.django_db
@@ -155,6 +156,15 @@ class TestWorkflowJobTemplate:
         assert nodes[1].unified_job_template == job_template
         assert nodes[2].inventory == inventory
 
+    def test_wfjt_unique_together_with_org(self, organization):
+        wfjt1 = WorkflowJobTemplate(name='foo', organization=organization)
+        wfjt1.save()
+        wfjt2 = WorkflowJobTemplate(name='foo', organization=organization)
+        with pytest.raises(ValidationError):
+            wfjt2.validate_unique()
+        wfjt2 = WorkflowJobTemplate(name='foo', organization=None)
+        wfjt2.validate_unique()
+
 
 @pytest.mark.django_db
 class TestWorkflowJobFailure:

awx/main/tests/functional/test_projects.py

@@ -6,6 +6,8 @@ import pytest
 from awx.api.versioning import reverse
 from awx.main.models import Project
 
+from django.core.exceptions import ValidationError
+
 
 #
 # Project listing and visibility tests
@@ -238,3 +240,14 @@ def test_cannot_schedule_manual_project(project, admin_user, post):
         }, admin_user, expect=400
     )
     assert 'Manual' in response.data['unified_job_template'][0]
+
+
+@pytest.mark.django_db
+def test_project_unique_together_with_org(organization):
+    proj1 = Project(name='foo', organization=organization)
+    proj1.save()
+    proj2 = Project(name='foo', organization=organization)
+    with pytest.raises(ValidationError):
+        proj2.validate_unique()
+    proj2 = Project(name='foo', organization=None)
+    proj2.validate_unique()