diff --git a/awx/api/urls/inventory_source.py b/awx/api/urls/inventory_source.py index 98c65d77bc..736797c5a7 100644 --- a/awx/api/urls/inventory_source.py +++ b/awx/api/urls/inventory_source.py @@ -13,7 +13,6 @@ from awx.api.views import ( InventorySourceCredentialsList, InventorySourceGroupsList, InventorySourceHostsList, - InventorySourceNotificationTemplatesAnyList, InventorySourceNotificationTemplatesErrorList, InventorySourceNotificationTemplatesStartedList, InventorySourceNotificationTemplatesSuccessList, diff --git a/awx/api/urls/job_template.py b/awx/api/urls/job_template.py index 3d61094eb4..922019d117 100644 --- a/awx/api/urls/job_template.py +++ b/awx/api/urls/job_template.py @@ -13,7 +13,6 @@ from awx.api.views import ( JobTemplateSchedulesList, JobTemplateSurveySpec, JobTemplateActivityStreamList, - JobTemplateNotificationTemplatesAnyList, JobTemplateNotificationTemplatesErrorList, JobTemplateNotificationTemplatesStartedList, JobTemplateNotificationTemplatesSuccessList, diff --git a/awx/api/urls/organization.py b/awx/api/urls/organization.py index 2fed9ca97f..952209423e 100644 --- a/awx/api/urls/organization.py +++ b/awx/api/urls/organization.py @@ -15,7 +15,6 @@ from awx.api.views import ( OrganizationCredentialList, OrganizationActivityStreamList, OrganizationNotificationTemplatesList, - OrganizationNotificationTemplatesAnyList, OrganizationNotificationTemplatesErrorList, OrganizationNotificationTemplatesStartedList, OrganizationNotificationTemplatesSuccessList, diff --git a/awx/api/urls/project.py b/awx/api/urls/project.py index 192c41f54a..c0909873df 100644 --- a/awx/api/urls/project.py +++ b/awx/api/urls/project.py @@ -14,7 +14,6 @@ from awx.api.views import ( ProjectUpdatesList, ProjectActivityStreamList, ProjectSchedulesList, - ProjectNotificationTemplatesAnyList, ProjectNotificationTemplatesErrorList, ProjectNotificationTemplatesStartedList, ProjectNotificationTemplatesSuccessList, diff --git a/awx/api/urls/system_job_template.py b/awx/api/urls/system_job_template.py index 9886c4c14a..396271417d 100644 --- a/awx/api/urls/system_job_template.py +++ b/awx/api/urls/system_job_template.py @@ -9,7 +9,6 @@ from awx.api.views import ( SystemJobTemplateLaunch, SystemJobTemplateJobsList, SystemJobTemplateSchedulesList, - SystemJobTemplateNotificationTemplatesAnyList, SystemJobTemplateNotificationTemplatesErrorList, SystemJobTemplateNotificationTemplatesStartedList, SystemJobTemplateNotificationTemplatesSuccessList, diff --git a/awx/api/urls/workflow_job_template.py b/awx/api/urls/workflow_job_template.py index 5429e0fc3e..0a33a8eaaa 100644 --- a/awx/api/urls/workflow_job_template.py +++ b/awx/api/urls/workflow_job_template.py @@ -13,7 +13,6 @@ from awx.api.views import ( WorkflowJobTemplateSurveySpec, WorkflowJobTemplateWorkflowNodesList, WorkflowJobTemplateActivityStreamList, - WorkflowJobTemplateNotificationTemplatesAnyList, WorkflowJobTemplateNotificationTemplatesErrorList, WorkflowJobTemplateNotificationTemplatesStartedList, WorkflowJobTemplateNotificationTemplatesSuccessList, diff --git a/awx/main/tests/functional/api/test_inventory.py b/awx/main/tests/functional/api/test_inventory.py index 9f7688ebf3..23f8ee4b13 100644 --- a/awx/main/tests/functional/api/test_inventory.py +++ b/awx/main/tests/functional/api/test_inventory.py @@ -42,7 +42,7 @@ def test_inventory_source_notification_on_cloud_only(get, post, inventory_source not_is = inventory_source_factory("not_ec2") - # Delete the below portion? + # Delete the below portion? ****** # url = reverse('api:inventory_source_notification_templates_any_list', kwargs={'pk': cloud_is.id}) # response = post(url, dict(id=notification_template.id), u) # assert response.status_code == 204 diff --git a/awx/main/tests/functional/test_notifications.py b/awx/main/tests/functional/test_notifications.py index fb209f5e77..227b15d9f5 100644 --- a/awx/main/tests/functional/test_notifications.py +++ b/awx/main/tests/functional/test_notifications.py @@ -92,7 +92,7 @@ def test_inherited_notification_templates(get, post, user, organization, project isrc.save() jt = JobTemplate.objects.create(name='test', inventory=i, project=project, playbook='debug.yml') jt.save() - # What can we replace the below tests with? + # What can we replace the below tests with? ****** # url = reverse('api:organization_notification_templates_any_list', kwargs={'pk': organization.id}) # response = post(url, dict(id=notification_templates[0]), u) # assert response.status_code == 204 @@ -107,12 +107,13 @@ def test_inherited_notification_templates(get, post, user, organization, project # assert len(isrc.notification_templates['any']) == 1 -@pytest.mark.django_db -def test_notification_template_merging(get, post, user, organization, project, notification_template): - user('admin-poster', True) - organization.notification_templates_any.add(notification_template) - project.notification_templates_any.add(notification_template) - assert len(project.notification_templates['any']) == 1 +# Delete the test below? ****** +# @pytest.mark.django_db +# def test_notification_template_merging(get, post, user, organization, project, notification_template): +# user('admin-poster', True) +# organization.notification_templates_any.add(notification_template) +# project.notification_templates_any.add(notification_template) +# assert len(project.notification_templates['any']) == 1 @pytest.mark.django_db