openstack/heat
Code Issues Proposed changes

Delete children handle_delete testing (Cinder)

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: I157a1cba3a035dc58f88f3b3d3f24fff015f85ff
This commit is contained in:
Peter Razumovsky
2015-09-07 17:45:32 +03:00
parent 9a3182aef1
commit 0d66ac19fd
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
heat/tests/cinder/test_cinder_volume_type.py
View File

@@ -183,20 +183,6 @@ class CinderVolumeTypeTest(common.HeatTestCase):
self.stub_KeystoneProjectConstraint()
self.assertIsNone(self.my_volume_type.validate())
def test_volume_type_handle_delete(self):
self.resource_id = None
self.assertIsNone(self.my_volume_type.handle_delete())
volume_type_id = '927202df-1afb-497f-8368-9c2d2f26e5db'
self.my_volume_type.resource_id = volume_type_id
self.volume_types.delete.return_value = None
self.assertEqual('927202df-1afb-497f-8368-9c2d2f26e5db',
self.my_volume_type.handle_delete())
def test_volume_type_handle_delete_not_found(self):
exc = self.cinderclient.HTTPClientError('Not Found.')
self.volume_types.delete.side_effect = exc
self.assertIsNone(self.my_volume_type.handle_delete())
def test_volume_type_show_resource(self):
volume_type_id = '927202df-1afb-497f-8368-9c2d2f26e5db'
self.my_volume_type.resource_id = volume_type_id

12
heat/tests/cinder/test_volume_type_encryption.py
View File

@@ -104,15 +104,3 @@ class CinderEncryptedVolumeTypeTest(common.HeatTestCase):
self.volume_encryption_types.update.assert_called_once_with(
volume_type=volume_type_id, specs=update_args)
def test_handle_delete(self):
volume_type_id = '01bd581d-33fe-4d6d-bd7b-70ae076d39fb'
self.my_encrypted_vol_type.resource_id = volume_type_id
self.volume_encryption_types.delete.return_value = None
self.assertEqual('01bd581d-33fe-4d6d-bd7b-70ae076d39fb',
self.my_encrypted_vol_type.handle_delete())
def test_handle_delete_rsrc_not_found(self):
exc = self.cinderclient.HTTPClientError('Not Found.')
self.volume_encryption_types.delete.side_effect = exc
self.assertIsNone(self.my_encrypted_vol_type.handle_delete())