From 42252c0f6f22e415bb48881efa1fac3acb32f3cc Mon Sep 17 00:00:00 2001 From: Peter Razumovsky Date: Mon, 7 Sep 2015 17:07:27 +0300 Subject: [PATCH] Delete children handle_delete testing (Barbican) Delete children handle_delete correctness testing for Resource's children classes. This tests can be deleted because of testing correctness of handle_delete in test_resource. Change-Id: Id75ee637f663a3d9bfc97a3b3cbf80737318e21b --- heat/tests/barbican/test_order.py | 27 --------------------------- heat/tests/barbican/test_secret.py | 24 ------------------------ 2 files changed, 51 deletions(-) diff --git a/heat/tests/barbican/test_order.py b/heat/tests/barbican/test_order.py index 6fed442e15..ca6ba71b0c 100644 --- a/heat/tests/barbican/test_order.py +++ b/heat/tests/barbican/test_order.py @@ -158,33 +158,6 @@ class TestOrder(common.HeatTestCase): args = self.barbican.orders.create.call_args[1] self.assertEqual(content_type, args[res.PAYLOAD_CONTENT_TYPE]) - def test_delete_order(self): - self.barbican.orders.create.return_value = 'foo' - res = self._create_resource('foo', self.res_template, self.stack) - self.assertEqual('foo', res.resource_id) - - scheduler.TaskRunner(res.delete)() - self.barbican.orders.delete.assert_called_once_with('foo') - - def test_handle_delete_ignores_not_found_errors(self): - res = self._create_resource('foo', self.res_template, self.stack) - - self.barbican.barbican_client.HTTPClientError = Exception - exc = self.barbican.barbican_client.HTTPClientError('Not Found. Nope.') - self.barbican.orders.delete.side_effect = exc - scheduler.TaskRunner(res.delete)() - self.assertTrue(self.barbican.orders.delete.called) - - def test_handle_delete_raises_resource_failure_on_error(self): - res = self._create_resource('foo', self.res_template, self.stack) - - self.barbican.barbican_client.HTTPClientError = Exception - exc = self.barbican.barbican_client.HTTPClientError('Boom.') - self.barbican.orders.delete.side_effect = exc - exc = self.assertRaises(exception.ResourceFailure, - scheduler.TaskRunner(res.delete)) - self.assertIn('Boom.', six.text_type(exc)) - def test_check_create_complete(self): res = order.Order('foo', self.res_template, self.stack) diff --git a/heat/tests/barbican/test_secret.py b/heat/tests/barbican/test_secret.py index e3ffa8892b..1cd413fbb0 100644 --- a/heat/tests/barbican/test_secret.py +++ b/heat/tests/barbican/test_secret.py @@ -12,7 +12,6 @@ # under the License. import mock -import six from heat.common import exception from heat.common import template_format @@ -140,26 +139,3 @@ class TestSecret(common.HeatTestCase): self.assertRaises(exception.ResourceFailure, self._create_resource, defn.name, defn, self.stack) - - def test_delete_secret(self): - self.assertEqual('foo_id', self.res.resource_id) - - mock_delete = self.barbican.secrets.delete - scheduler.TaskRunner(self.res.delete)() - - mock_delete.assert_called_once_with('foo_id') - - def test_handle_delete_ignores_not_found_errors(self): - self.barbican.barbican_client.HTTPClientError = Exception - exc = self.barbican.barbican_client.HTTPClientError('Not Found.') - self.barbican.secrets.delete.side_effect = exc - scheduler.TaskRunner(self.res.delete)() - self.assertTrue(self.barbican.secrets.delete.called) - - def test_handle_delete_raises_resource_failure_on_error(self): - self.barbican.barbican_client.HTTPClientError = Exception - exc = self.barbican.barbican_client.HTTPClientError('Boom.') - self.barbican.secrets.delete.side_effect = exc - exc = self.assertRaises(exception.ResourceFailure, - scheduler.TaskRunner(self.res.delete)) - self.assertIn('Boom.', six.text_type(exc))