openstack/heat
Code Issues Proposed changes

Delete children handle_delete testing (Barbican)

Browse Source 
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
This commit is contained in:
Peter Razumovsky 2015-09-07 17:07:27 +03:00
parent db16a6ebae
commit 42252c0f6f
2 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
heat/tests/barbican/test_order.py
View File

@ -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)

24
heat/tests/barbican/test_secret.py
View File

@ -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))