Clean up tests setup

utils.setup_dummy_db() is called in parent class.
resources.initialise() seem to have no actual effect
in this tests.
self.ctx = utils.dummy_context() is often declared
but not used.

Change-Id: Iadcfd58b365ea8788f08a12ffaba612c6e5286cb

heat/tests/engine/service/test_stack_snapshot.py

@@ -35,7 +35,6 @@ class SnapshotServiceTest(common.HeatTestCase):
 
         self.engine = service.EngineService('a-host', 'a-topic')
         self.engine.create_periodic_tasks()
-        utils.setup_dummy_db()
 
     def _create_stack(self, stack_name, files=None):
         t = template_format.parse(tools.wp_template)

heat/tests/openstack/barbican/test_container.py

@@ -86,8 +86,6 @@ class TestContainer(common.HeatTestCase):
 
     def setUp(self):
         super(TestContainer, self).setUp()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
 
         self.patcher_client = mock.patch.object(
             container.GenericContainer, 'client')

heat/tests/openstack/barbican/test_order.py

@@ -50,8 +50,6 @@ class TestOrder(common.HeatTestCase):
 
     def setUp(self):
         super(TestOrder, self).setUp()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
         tmpl = template_format.parse(stack_template)
         self.stack = utils.parse_stack(tmpl)
 

heat/tests/openstack/barbican/test_secret.py

@@ -45,8 +45,6 @@ class TestSecret(common.HeatTestCase):
 
     def setUp(self):
         super(TestSecret, self).setUp()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
 
         self.patcher_client = mock.patch.object(secret.Secret, 'client')
         mock_client = self.patcher_client.start()

heat/tests/openstack/glance/test_image.py

@@ -58,9 +58,7 @@ class GlanceImageTest(common.HeatTestCase):
     def setUp(self):
         super(GlanceImageTest, self).setUp()
 
-        utils.setup_dummy_db()
         self.ctx = utils.dummy_context()
-
         tpl = template_format.parse(image_template)
         self.stack = parser.Stack(
             self.ctx, 'glance_image_test_stack',

heat/tests/openstack/heat/test_cw_alarm.py

@@ -51,8 +51,6 @@ alarm_template = '''
 
 
 class CloudWatchAlarmTest(common.HeatTestCase):
-    def setUp(self):
-        super(CloudWatchAlarmTest, self).setUp()
 
     def create_alarm(self, t, stack, resource_name):
         resource_defns = stack.t.resource_definitions(stack)

heat/tests/openstack/heat/test_random_string.py

@@ -78,10 +78,6 @@ Resources:
           min: 5
 '''
 
-    def setUp(self):
-        super(TestRandomString, self).setUp()
-        self.ctx = utils.dummy_context()
-
     def create_stack(self, templ):
         self.stack = self.parse_stack(template_format.parse(templ))
         self.assertIsNone(self.stack.create())

heat/tests/openstack/heat/test_resource_group.py

@@ -966,8 +966,6 @@ def get_fake_nested_stack(names):
 
 
 class RollingUpdatePolicyTest(common.HeatTestCase):
-    def setUp(self):
-        super(RollingUpdatePolicyTest, self).setUp()
 
     def test_parse_without_update_policy(self):
         stack = utils.parse_stack(template)
@@ -1015,8 +1013,6 @@ class RollingUpdatePolicyTest(common.HeatTestCase):
 
 
 class RollingUpdatePolicyDiffTest(common.HeatTestCase):
-    def setUp(self):
-        super(RollingUpdatePolicyDiffTest, self).setUp()
 
     def validate_update_policy_diff(self, current, updated):
         # load current stack
@@ -1061,8 +1057,6 @@ class RollingUpdatePolicyDiffTest(common.HeatTestCase):
 
 
 class RollingUpdateTest(common.HeatTestCase):
-    def setUp(self):
-        super(RollingUpdateTest, self).setUp()
 
     def check_with_update(self, with_policy=False, with_diff=False):
         current = copy.deepcopy(template)
@@ -1130,9 +1124,6 @@ class TestUtils(common.HeatTestCase):
 
     ]
 
-    def setUp(self):
-        super(TestUtils, self).setUp()
-
     def test_count_black_listed(self):
         stack = utils.parse_stack(template2)
         snip = stack.t.resource_definitions(stack)['group1']

heat/tests/openstack/heat/test_structured_config.py

@@ -166,8 +166,6 @@ class StructuredDeploymentDerivedTest(common.HeatTestCase):
             self.ctx, 'software_deploly_test_stack',
             template.Template(self.template))
         self.deployment = self.stack['deploy_mysql']
-        heat = mock.MagicMock()
-        self.deployments = heat.return_value.software_deployments
 
     def test_build_derived_config(self):
         source = {
@@ -218,8 +216,6 @@ class StructuredDeploymentWithStrictInputTest(common.HeatTestCase):
             self.ctx, 'software_deploly_test_stack',
             template.Template(template_def))
         self.deployment = self.stack['deploy_mysql']
-        heat = mock.MagicMock()
-        self.deployments = heat.return_value.software_deployments
 
     def test_build_derived_config_failure(self):
         props = {'input_values_validate': 'STRICT'}
@@ -267,11 +263,6 @@ class StructuredDeploymentGroupTest(common.HeatTestCase):
         }
     }
 
-    def setUp(self):
-        common.HeatTestCase.setUp(self)
-        heat = mock.MagicMock()
-        self.deployments = heat.return_value.software_deployments
-
     def test_build_resource_definition(self):
         stack = utils.parse_stack(self.template)
         snip = stack.t.resource_definitions(stack)['deploy_mysql']

heat/tests/openstack/heat/test_swiftsignal.py

@@ -113,9 +113,6 @@ def cont_index(obj_name, num_version_hist):
 
 
 class SwiftSignalHandleTest(common.HeatTestCase):
-    def setUp(self):
-        super(SwiftSignalHandleTest, self).setUp()
-        utils.setup_dummy_db()
 
     @mock.patch.object(swift.SwiftClientPlugin, '_create')
     @mock.patch.object(resource.Resource, 'physical_resource_name')
@@ -296,9 +293,6 @@ class SwiftSignalHandleTest(common.HeatTestCase):
 
 
 class SwiftSignalTest(common.HeatTestCase):
-    def setUp(self):
-        super(SwiftSignalTest, self).setUp()
-        utils.setup_dummy_db()
 
     @mock.patch.object(swift.SwiftClientPlugin, '_create')
     @mock.patch.object(resource.Resource, 'physical_resource_name')

heat/tests/openstack/magnum/test_bay.py

@@ -48,7 +48,6 @@ RESOURCE_TYPE = 'OS::Magnum::Bay'
 class TestMagnumBay(common.HeatTestCase):
     def setUp(self):
         super(TestMagnumBay, self).setUp()
-        self.ctx = utils.dummy_context()
         resource._register_class(RESOURCE_TYPE, bay.Bay)
         t = template_format.parse(magnum_template)
         self.stack = utils.parse_stack(t)

heat/tests/openstack/magnum/test_baymodel.py

@@ -60,7 +60,6 @@ class TestMagnumBayModel(common.HeatTestCase):
 
     def setUp(self):
         super(TestMagnumBayModel, self).setUp()
-        self.ctx = utils.dummy_context()
         resource._register_class(RESOURCE_TYPE, baymodel.BayModel)
         t = template_format.parse(self.magnum_template)
         self.stack = utils.parse_stack(t)

heat/tests/openstack/manila/test_security_service.py

@@ -16,7 +16,6 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine import resources
 from heat.engine.resources.openstack.manila import security_service
 from heat.engine import scheduler
 from heat.engine import template
@@ -74,9 +73,6 @@ class ManilaSecurityServiceTest(common.HeatTestCase):
 
     def setUp(self):
         super(ManilaSecurityServiceTest, self).setUp()
-        resources.initialise()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
 
         t = template_format.parse(stack_template)
         self.stack = utils.parse_stack(t)

heat/tests/openstack/manila/test_share.py

@@ -59,8 +59,6 @@ class ManilaShareTest(common.HeatTestCase):
 
     def setUp(self):
         super(ManilaShareTest, self).setUp()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
 
         self.fake_share = mock.MagicMock(id="test_share_id")
         self.available_share = mock.MagicMock(

heat/tests/openstack/manila/test_share_network.py

@@ -54,8 +54,6 @@ class ManilaShareNetworkTest(common.HeatTestCase):
 
     def setUp(self):
         super(ManilaShareNetworkTest, self).setUp()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
 
         self.tmpl = template_format.parse(stack_template)
         self.stack = utils.parse_stack(self.tmpl)

heat/tests/openstack/manila/test_share_type.py

@@ -16,7 +16,6 @@ import copy
 import mock
 
 from heat.common import template_format
-from heat.engine import resources
 from heat.engine.resources.openstack.manila import share_type as mshare_type
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
@@ -44,12 +43,6 @@ class DummyShare(object):
 
 class ManilaShareTypeTest(common.HeatTestCase):
 
-    def setUp(self):
-        super(ManilaShareTypeTest, self).setUp()
-        resources.initialise()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
-
     def _init_share(self, stack_name, share_type_name="test_share_type"):
         # parse stack
         tmp = template_format.parse(manila_template)

heat/tests/openstack/mistral/test_cron_trigger.py

@@ -15,7 +15,6 @@ import mock
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine import resources
 from heat.engine.resources.openstack.mistral import cron_trigger
 from heat.engine import scheduler
 from heat.tests import common
@@ -49,9 +48,6 @@ class MistralCronTriggerTest(common.HeatTestCase):
 
     def setUp(self):
         super(MistralCronTriggerTest, self).setUp()
-        resources.initialise()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
 
         t = template_format.parse(stack_template)
         self.stack = utils.parse_stack(t)

heat/tests/openstack/mistral/test_workflow.py

@@ -22,7 +22,6 @@ from heat.common import exception
 from heat.common import template_format
 from heat.engine.clients.os import mistral as client
 from heat.engine import resource
-from heat.engine import resources
 from heat.engine.resources.openstack.mistral import workflow
 from heat.engine.resources import signal_responder
 from heat.engine.resources import stack_user
@@ -318,8 +317,6 @@ class FakeWorkflow(object):
 class TestMistralWorkflow(common.HeatTestCase):
     def setUp(self):
         super(TestMistralWorkflow, self).setUp()
-        resources.initialise()
-        utils.setup_dummy_db()
         self.ctx = utils.dummy_context()
         tmpl = template_format.parse(workflow_template)
         self.stack = utils.parse_stack(tmpl, stack_name='test_stack')

heat/tests/openstack/neutron/lbaas/test_health_monitor.py

@@ -26,9 +26,6 @@ from heat.tests import utils
 
 class HealthMonitorTest(common.HeatTestCase):
 
-    def setUp(self):
-        super(HealthMonitorTest, self).setUp()
-
     @mock.patch('heat.engine.clients.os.neutron.'
                 'NeutronClientPlugin.has_extension', return_value=True)
     def _create_stack(self, ext_func, tmpl=inline_templates.MONITOR_TEMPLATE):

heat/tests/openstack/neutron/lbaas/test_listener.py

@@ -29,9 +29,6 @@ from heat.tests import utils
 
 class ListenerTest(common.HeatTestCase):
 
-    def setUp(self):
-        super(ListenerTest, self).setUp()
-
     def test_resource_mapping(self):
         mapping = listener.resource_mapping()
         self.assertEqual(listener.Listener,

heat/tests/openstack/neutron/lbaas/test_loadbalancer.py

@@ -28,9 +28,6 @@ from heat.tests import utils
 
 class LoadBalancerTest(common.HeatTestCase):
 
-    def setUp(self):
-        super(LoadBalancerTest, self).setUp()
-
     def test_resource_mapping(self):
         mapping = loadbalancer.resource_mapping()
         self.assertEqual(loadbalancer.LoadBalancer,

heat/tests/openstack/neutron/lbaas/test_pool.py

@@ -30,9 +30,6 @@ from heat.tests import utils
 
 class PoolTest(common.HeatTestCase):
 
-    def setUp(self):
-        super(PoolTest, self).setUp()
-
     def test_resource_mapping(self):
         mapping = pool.resource_mapping()
         self.assertEqual(pool.Pool,

heat/tests/openstack/neutron/test_address_scope.py

@@ -37,9 +37,7 @@ class NeutronAddressScopeTest(common.HeatTestCase):
     def setUp(self):
         super(NeutronAddressScopeTest, self).setUp()
 
-        utils.setup_dummy_db()
         self.ctx = utils.dummy_context()
-
         tpl = template_format.parse(address_scope_template)
         self.stack = stack.Stack(
             self.ctx,

heat/tests/openstack/neutron/test_qos.py

@@ -63,9 +63,7 @@ class NeutronQoSPolicyTest(common.HeatTestCase):
     def setUp(self):
         super(NeutronQoSPolicyTest, self).setUp()
 
-        utils.setup_dummy_db()
         self.ctx = utils.dummy_context()
-
         tpl = template_format.parse(qos_policy_template)
         self.stack = stack.Stack(
             self.ctx,
@@ -183,9 +181,7 @@ class NeutronQoSBandwidthLimitRuleTest(common.HeatTestCase):
     def setUp(self):
         super(NeutronQoSBandwidthLimitRuleTest, self).setUp()
 
-        utils.setup_dummy_db()
         self.ctx = utils.dummy_context()
-
         tpl = template_format.parse(bandwidth_limit_rule_template)
         self.stack = stack.Stack(
             self.ctx,
@@ -294,9 +290,7 @@ class NeutronQoSDscpMarkingRuleTest(common.HeatTestCase):
     def setUp(self):
         super(NeutronQoSDscpMarkingRuleTest, self).setUp()
 
-        utils.setup_dummy_db()
         self.ctx = utils.dummy_context()
-
         tpl = template_format.parse(dscp_marking_rule_template)
         self.stack = stack.Stack(
             self.ctx,

heat/tests/openstack/trove/test_cluster.py

@@ -74,8 +74,6 @@ class TroveClusterTest(common.HeatTestCase):
 
     def setUp(self):
         super(TroveClusterTest, self).setUp()
-        utils.setup_dummy_db()
-        self.ctx = utils.dummy_context()
 
         self.tmpl = template_format.parse(stack_template)
         self.stack = utils.parse_stack(self.tmpl)