Delete children handle_delete testing (Manila)

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: I638a1c9984646119258521eb4605086d19a46989

heat/tests/manila/test_manila_security_service.py

@@ -122,24 +122,6 @@ class ManilaSecurityServiceTest(common.HeatTestCase):
         self.assertEqual(security_service.SecurityService,
                          mapping['OS::Manila::SecurityService'])
 
-    def test_delete(self):
-        ss = self._create_resource('security_service', self.rsrc_defn,
-                                   self.stack)
-        scheduler.TaskRunner(ss.delete)()
-        self.assertEqual((ss.DELETE, ss.COMPLETE), ss.state)
-        self.client.security_services.delete.assert_called_once_with(
-            ss.resource_id)
-
-    def test_delete_not_found(self):
-        ss = self._create_resource('security_service', self.rsrc_defn,
-                                   self.stack)
-        self.client.security_services.delete.side_effect = (
-            self.client.exceptions.NotFound())
-        scheduler.TaskRunner(ss.delete)()
-        self.assertEqual((ss.DELETE, ss.COMPLETE), ss.state)
-        self.client.security_services.delete.assert_called_once_with(
-            ss.resource_id)
-
     def test_update(self):
         ss = self._create_resource('security_service', self.rsrc_defn,
                                    self.stack)

heat/tests/manila/test_manila_share.py

@@ -139,22 +139,6 @@ class ManilaShareTest(common.HeatTestCase):
                                 self.deleting_share)
         self.assertIn("Unknown status", six.text_type(exc))
 
-    def test_share_delete(self):
-        share = self._create_share("stack_share_delete")
-        share.client().shares.get.side_effect = exception.NotFound()
-        share.client_plugin().ignore_not_found.return_value = None
-        scheduler.TaskRunner(share.delete)()
-        share.client().shares.delete.assert_called_once_with(
-            self.fake_share.id)
-
-    def test_share_delete_fail(self):
-        share = self._create_share("stack_share_delete_fail")
-        share.client().shares.delete.return_value = None
-        share.client().shares.get.return_value = self.failed_share
-        exc = self.assertRaises(exception.ResourceFailure,
-                                scheduler.TaskRunner(share.delete))
-        self.assertIn("Error during deleting share", six.text_type(exc))
-
     def test_share_check(self):
         share = self._create_share("stack_share_check")
         scheduler.TaskRunner(share.check)()

heat/tests/manila/test_manila_share_type.py

@@ -15,7 +15,6 @@ import copy
 
 import mock
 
-from heat.common import exception
 from heat.common import template_format
 from heat.engine import resources
 from heat.engine.resources.openstack.manila import share_type as mshare_type
@@ -79,28 +78,6 @@ class ManilaShareTypeTest(common.HeatTestCase):
             is_public=False)
         fake_share_type.set_keys.assert_called_once_with({"test": "test"})
 
-    def test_share_type_delete(self):
-        share_type = self._init_share("stack_share_type_delete")
-        fake_share_type = mock.MagicMock(id="type_id")
-        share_type.client().share_types.create.return_value = fake_share_type
-        scheduler.TaskRunner(share_type.create)()
-
-        scheduler.TaskRunner(share_type.delete)()
-        share_type.client().share_types.delete.assert_called_once_with(
-            "type_id")
-
-    def test_share_type_delete_not_found(self):
-        share_type = self._init_share("stack_share_type_delete_not_found")
-        fake_share_type = mock.MagicMock(id="type_id")
-        share_type.client().share_types.create.return_value = fake_share_type
-        scheduler.TaskRunner(share_type.create)()
-
-        exc = exception.NotFound()
-        share_type.client().share_types.delete.side_effect = exc
-        scheduler.TaskRunner(share_type.delete)()
-        share_type.client_plugin().ignore_not_found.assert_called_once_with(
-            exc)
-
     def test_share_type_update(self):
         share_type = self._init_share("stack_share_type_update")
         share_type.client().share_types.create.return_value = mock.MagicMock(

heat/tests/manila/test_share_network.py

@@ -152,22 +152,6 @@ class ManilaShareNetworkTest(common.HeatTestCase):
         run = scheduler.TaskRunner(net.update, update_template)
         self.assertRaises(exception.ResourceFailure, run)
 
-    def test_delete(self):
-        net = self._create_network('share_network', self.rsrc_defn, self.stack)
-        scheduler.TaskRunner(net.delete)()
-        self.assertEqual((net.DELETE, net.COMPLETE), net.state)
-        self.client.share_networks.delete.assert_called_once_with(
-            net.resource_id)
-
-    def test_delete_not_found(self):
-        net = self._create_network('share_network', self.rsrc_defn, self.stack)
-        self.client.share_networks.delete.side_effect = (
-            self.client.exceptions.NotFound())
-        scheduler.TaskRunner(net.delete)()
-        self.assertEqual((net.DELETE, net.COMPLETE), net.state)
-        self.client.share_networks.delete.assert_called_once_with(
-            net.resource_id)
-
     def test_nova_net_neutron_net_conflict(self):
         t = template_format.parse(stack_template)
         t['resources']['share_network']['properties']['nova_network'] = 1