diff --git a/awx/main/tests/functional/api/test_inventory.py b/awx/main/tests/functional/api/test_inventory.py index 23f8ee4b13..9340e8993b 100644 --- a/awx/main/tests/functional/api/test_inventory.py +++ b/awx/main/tests/functional/api/test_inventory.py @@ -42,11 +42,6 @@ def test_inventory_source_notification_on_cloud_only(get, post, inventory_source not_is = inventory_source_factory("not_ec2") - # 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 - url = reverse('api:inventory_source_notification_templates_success_list', kwargs={'pk': not_is.id}) response = post(url, dict(id=notification_template.id), u) assert response.status_code == 400 diff --git a/awx/main/tests/functional/test_notifications.py b/awx/main/tests/functional/test_notifications.py index 227b15d9f5..576bc71a7a 100644 --- a/awx/main/tests/functional/test_notifications.py +++ b/awx/main/tests/functional/test_notifications.py @@ -92,29 +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? ****** - # 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 - # url = reverse('api:project_notification_templates_any_list', kwargs={'pk': project.id}) - # response = post(url, dict(id=notification_templates[1]), u) - # assert response.status_code == 204 - # url = reverse('api:job_template_notification_templates_any_list', kwargs={'pk': jt.id}) - # response = post(url, dict(id=notification_templates[2]), u) - # assert response.status_code == 204 - # assert len(jt.notification_templates['any']) == 3 - # assert len(project.notification_templates['any']) == 2 - # assert len(isrc.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 def test_notification_template_simple_patch(patch, notification_template, admin):