External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove tests for 'any' notification state

Browse Source
This commit is contained in:
beeankha
2019-06-13 14:48:28 -04:00
parent f5b6bd65cf
commit 17c89ed412
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tests/functional/api/test_inventory.py
View File

@@ -42,11 +42,6 @@ def test_inventory_source_notification_on_cloud_only(get, post, inventory_source
not_is = inventory_source_factory("not_ec2") 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}) url = reverse('api:inventory_source_notification_templates_success_list', kwargs={'pk': not_is.id})
response = post(url, dict(id=notification_template.id), u) response = post(url, dict(id=notification_template.id), u)
assert response.status_code == 400 assert response.status_code == 400

22
awx/main/tests/functional/test_notifications.py
View File

@@ -92,28 +92,6 @@ def test_inherited_notification_templates(get, post, user, organization, project
isrc.save() isrc.save()
jt = JobTemplate.objects.create(name='test', inventory=i, project=project, playbook='debug.yml') jt = JobTemplate.objects.create(name='test', inventory=i, project=project, playbook='debug.yml')
jt.save() 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 @pytest.mark.django_db