openstack/deb-heat
Code Issues Proposed changes

Remove tests for _show_resource in manila

Browse Source 
Manila uses default (base class) implementation of _show_resource,
so we can remove tests from here. Also, add test for entity object
to prevent regressions: base class test do not handle situation when we
remove or update entity in descendant class.

Change-Id: I69da6e6ecd705223b06d5a814c67d88fb4569b7b
This commit is contained in:
Oleksii Chuprykov 2015-09-14 13:06:14 +03:00
parent 864181e522
commit 39da107db5
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/tests/manila/test_manila_security_service.py
View File

@ -103,6 +103,7 @@ class ManilaSecurityServiceTest(common.HeatTestCase):
self.stack)
expected_state = (ct.CREATE, ct.COMPLETE)
self.assertEqual(expected_state, ct.state)
self.assertEqual('security_services', ct.entity)
def test_create_failed(self):
ss = security_service.SecurityService('security_service',
@ -151,10 +152,3 @@ class ManilaSecurityServiceTest(common.HeatTestCase):
scheduler.TaskRunner(ss.update, new_ss))
msg = 'The Resource security_service requires replacement.'
self.assertEqual(msg, six.text_type(err))
def test_show_resource(self):
sservice = self._create_resource('service', self.rsrc_defn, self.stack)
service = mock.Mock()
service.to_dict.return_value = {'attr': 'val'}
self.client.security_services.get.return_value = service
self.assertEqual({'attr': 'val'}, sservice.FnGetAtt('show'))

3
heat/tests/manila/test_manila_share.py
View File

@ -53,7 +53,6 @@ class DummyShare(object):
self.created_at = 'ca'
self.status = 's'
self.project_id = 'p_id'
self.to_dict = lambda: {'attr': 'val'}
class ManilaShareTest(common.HeatTestCase):
@ -122,6 +121,7 @@ class ManilaShareTest(common.HeatTestCase):
"Metadata" + message_end)
self.assertTrue(kwargs["is_public"])
share.client().shares.get.assert_called_once_with(self.fake_share.id)
self.assertEqual('shares', share.entity)
def test_share_create_fail(self):
share = self._init_share("stack_share_create_fail")
@ -225,4 +225,3 @@ class ManilaShareTest(common.HeatTestCase):
self.assertEqual('ca', share.FnGetAtt('created_at'))
self.assertEqual('s', share.FnGetAtt('status'))
self.assertEqual('p_id', share.FnGetAtt('project_id'))
self.assertEqual({'attr': 'val'}, share.FnGetAtt('show'))

9
heat/tests/manila/test_manila_share_type.py
View File

@ -77,6 +77,7 @@ class ManilaShareTypeTest(common.HeatTestCase):
name="test_share_type", spec_driver_handles_share_servers=True,
is_public=False)
fake_share_type.set_keys.assert_called_once_with({"test": "test"})
self.assertEqual('share_types', share_type.entity)
def test_share_type_update(self):
share_type = self._init_share("stack_share_type_update")
@ -94,11 +95,3 @@ class ManilaShareTypeTest(common.HeatTestCase):
fake_share_type.unset_keys.assert_called_once_with({"test": "test"})
fake_share_type.set_keys.assert_called_with(
updated_props[mshare_type.ManilaShareType.EXTRA_SPECS])
def test_show_resource(self):
share_type = self._init_share("stack_share_type_create")
share_type.client().share_types.create.return_value = mock.Mock(
id='type_id')
share_type.client().share_types.get.return_value = DummyShare()
scheduler.TaskRunner(share_type.create)()
self.assertEqual({'attr': 'val'}, share_type.FnGetAtt('show'))

3
heat/tests/manila/test_share_network.py
View File

@ -45,7 +45,6 @@ class DummyShareNetwork(object):
self.cidr = '3'
self.ip_version = '5'
self.network_type = '6'
self.to_dict = lambda: {'attr': 'val'}
class ManilaShareNetworkTest(common.HeatTestCase):
@ -98,6 +97,7 @@ class ManilaShareNetworkTest(common.HeatTestCase):
calls = [mock.call('42', '6'), mock.call('42', '7')]
net.client().share_networks.add_security_service.assert_has_calls(
calls, any_order=True)
self.assertEqual('share_networks', net.entity)
def test_create_fail(self):
self.client.share_networks.add_security_service.side_effect = (
@ -193,7 +193,6 @@ class ManilaShareNetworkTest(common.HeatTestCase):
self.assertEqual('3', net.FnGetAtt('cidr'))
self.assertEqual('5', net.FnGetAtt('ip_version'))
self.assertEqual('6', net.FnGetAtt('network_type'))
self.assertEqual({'attr': 'val'}, net.FnGetAtt('show'))
def test_resource_mapping(self):
mapping = share_network.resource_mapping()