From 764b024eb71883f39a658fcaf4a3899ee82cb58a Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Tue, 12 Nov 2019 17:44:49 +0000 Subject: [PATCH] Remove non-zero period negative tests By allowing all notification types to support periodic notifications these tests are no longer required. After this feature has been merged, some tests could be added back to prevent regressions in the new behaviour. Depends-On: https://review.opendev.org/719989 Change-Id: I18a27800b8c1b28ab224375b42c57ac6a0f7ae78 Story: 2006837 Task: 37421 --- .../tests/api/test_notification_methods.py | 126 ------------------ 1 file changed, 126 deletions(-) diff --git a/monasca_tempest_tests/tests/api/test_notification_methods.py b/monasca_tempest_tests/tests/api/test_notification_methods.py index da34f83..df53fd4 100644 --- a/monasca_tempest_tests/tests/api/test_notification_methods.py +++ b/monasca_tempest_tests/tests/api/test_notification_methods.py @@ -294,24 +294,6 @@ class TestNotificationMethods(base.BaseMonascaTest): self.monasca_client.create_notifications, notification) - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_create_email_notification_method_with_invalid_non_zero_period(self): - notification = helpers.create_notification(period=60) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.create_notifications, - notification) - - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_create_pagerduty_notification_method_with_invalid_non_zero_period(self): - notification = helpers.create_notification(type='PAGERDUTY', - address='test03@localhost', - period=60) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.create_notifications, - notification) - @decorators.attr(type="gate") @decorators.attr(type=['negative']) def test_create_webhook_notification_method_with_invalid_period(self): @@ -757,63 +739,6 @@ class TestNotificationMethods(base.BaseMonascaTest): name=name, type='EMAIL', address='bob@thebridge.org', period=0) - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_update_email_notification_method_with_nonzero_period(self): - name = data_utils.rand_name('notification-') - notification = helpers.create_notification(name=name) - resp, response_body = self.monasca_client.create_notifications( - notification) - id = response_body['id'] - self.assertEqual(201, resp.status) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.update_notification_method, id, - name=response_body['name'], type=response_body['type'], - address=response_body['address'], period=60) - resp, response_body = \ - self.monasca_client.delete_notification_method(id) - self.assertEqual(204, resp.status) - - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_update_webhook_notification_method_to_email_with_nonzero_period(self): - name = data_utils.rand_name('notification-') - notification = helpers.create_notification(name=name, - type='WEBHOOK', - address='http://localhost/test01', - period=60) - resp, response_body = self.monasca_client.create_notifications( - notification) - id = response_body['id'] - self.assertEqual(201, resp.status) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.update_notification_method, id, - name=response_body['name'], type='EMAIL', - address='test@localhost', period=response_body['period']) - resp, response_body = \ - self.monasca_client.delete_notification_method(id) - self.assertEqual(204, resp.status) - - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_update_webhook_notification_method_to_pagerduty_with_nonzero_period(self): - name = data_utils.rand_name('notification-') - notification = helpers.create_notification(name=name, - type='WEBHOOK', - address='http://localhost/test01', - period=60) - resp, response_body = self.monasca_client.create_notifications( - notification) - id = response_body['id'] - self.assertEqual(201, resp.status) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.update_notification_method, id, - name=response_body['name'], type='PAGERDUTY', - address='test@localhost', period=response_body['period']) - resp, response_body = \ - self.monasca_client.delete_notification_method(id) - self.assertEqual(204, resp.status) - @decorators.attr(type="gate") @decorators.attr(type=['negative']) def test_update_notification_method_with_non_int_period(self): @@ -996,57 +921,6 @@ class TestNotificationMethods(base.BaseMonascaTest): self.monasca_client.delete_notification_method(id) self.assertEqual(204, resp.status) - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_patch_email_notification_method_with_nonzero_period(self): - name = data_utils.rand_name('notification-') - notification = helpers.create_notification(name=name) - resp, response_body = self.monasca_client.create_notifications( - notification) - id = response_body['id'] - self.assertEqual(201, resp.status) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.patch_notification_method, id, period=60) - resp, response_body = \ - self.monasca_client.delete_notification_method(id) - self.assertEqual(204, resp.status) - - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_patch_webhook_notification_method_to_email_with_nonzero_period(self): - name = data_utils.rand_name('notification-') - notification = helpers.create_notification(name=name, - type='WEBHOOK', - address='http://localhost/test01', - period=60) - resp, response_body = self.monasca_client.create_notifications( - notification) - id = response_body['id'] - self.assertEqual(201, resp.status) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.patch_notification_method, id, type='EMAIL') - resp, response_body = \ - self.monasca_client.delete_notification_method(id) - self.assertEqual(204, resp.status) - - @decorators.attr(type="gate") - @decorators.attr(type=['negative']) - def test_patch_webhook_notification_method_to_pagerduty_with_nonzero_period(self): - name = data_utils.rand_name('notification-') - notification = helpers.create_notification(name=name, - type='WEBHOOK', - address='http://localhost/test01', - period=60) - resp, response_body = self.monasca_client.create_notifications( - notification) - id = response_body['id'] - self.assertEqual(201, resp.status) - self.assertRaises((exceptions.BadRequest, exceptions.UnprocessableEntity), - self.monasca_client.patch_notification_method, id, type='PAGERDUTY') - resp, response_body = \ - self.monasca_client.delete_notification_method(id) - self.assertEqual(204, resp.status) - @decorators.attr(type="gate") @decorators.attr(type=['negative']) def test_patch_notification_method_with_non_int_period(self):