From 13c338f2663b0a3bc63fdeab95ecc3518de715f0 Mon Sep 17 00:00:00 2001 From: Dmitriy Uvarenkov Date: Thu, 9 Jun 2016 16:42:06 +0300 Subject: [PATCH] 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 | 1 - heat/tests/openstack/barbican/test_container.py | 2 -- heat/tests/openstack/barbican/test_order.py | 2 -- heat/tests/openstack/barbican/test_secret.py | 2 -- heat/tests/openstack/glance/test_image.py | 2 -- heat/tests/openstack/heat/test_cw_alarm.py | 2 -- heat/tests/openstack/heat/test_random_string.py | 4 ---- heat/tests/openstack/heat/test_resource_group.py | 9 --------- heat/tests/openstack/heat/test_structured_config.py | 9 --------- heat/tests/openstack/heat/test_swiftsignal.py | 6 ------ heat/tests/openstack/magnum/test_bay.py | 1 - heat/tests/openstack/magnum/test_baymodel.py | 1 - heat/tests/openstack/manila/test_security_service.py | 4 ---- heat/tests/openstack/manila/test_share.py | 2 -- heat/tests/openstack/manila/test_share_network.py | 2 -- heat/tests/openstack/manila/test_share_type.py | 7 ------- heat/tests/openstack/mistral/test_cron_trigger.py | 4 ---- heat/tests/openstack/mistral/test_workflow.py | 3 --- .../tests/openstack/neutron/lbaas/test_health_monitor.py | 3 --- heat/tests/openstack/neutron/lbaas/test_listener.py | 3 --- heat/tests/openstack/neutron/lbaas/test_loadbalancer.py | 3 --- heat/tests/openstack/neutron/lbaas/test_pool.py | 3 --- heat/tests/openstack/neutron/test_address_scope.py | 2 -- heat/tests/openstack/neutron/test_qos.py | 6 ------ heat/tests/openstack/trove/test_cluster.py | 2 -- 25 files changed, 85 deletions(-) diff --git a/heat/tests/engine/service/test_stack_snapshot.py b/heat/tests/engine/service/test_stack_snapshot.py index 01829205e2..d0a2d6c554 100644 --- a/heat/tests/engine/service/test_stack_snapshot.py +++ b/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) diff --git a/heat/tests/openstack/barbican/test_container.py b/heat/tests/openstack/barbican/test_container.py index b759174dc2..124d06d6d6 100644 --- a/heat/tests/openstack/barbican/test_container.py +++ b/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') diff --git a/heat/tests/openstack/barbican/test_order.py b/heat/tests/openstack/barbican/test_order.py index 840bd31102..776d2c0c5f 100644 --- a/heat/tests/openstack/barbican/test_order.py +++ b/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) diff --git a/heat/tests/openstack/barbican/test_secret.py b/heat/tests/openstack/barbican/test_secret.py index 6bb6342854..47219473ee 100644 --- a/heat/tests/openstack/barbican/test_secret.py +++ b/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() diff --git a/heat/tests/openstack/glance/test_image.py b/heat/tests/openstack/glance/test_image.py index 36e5f99722..4c09ff0b34 100644 --- a/heat/tests/openstack/glance/test_image.py +++ b/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', diff --git a/heat/tests/openstack/heat/test_cw_alarm.py b/heat/tests/openstack/heat/test_cw_alarm.py index 31f05434d2..f5e9dea12a 100644 --- a/heat/tests/openstack/heat/test_cw_alarm.py +++ b/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) diff --git a/heat/tests/openstack/heat/test_random_string.py b/heat/tests/openstack/heat/test_random_string.py index 84070f2666..bc2a089891 100644 --- a/heat/tests/openstack/heat/test_random_string.py +++ b/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()) diff --git a/heat/tests/openstack/heat/test_resource_group.py b/heat/tests/openstack/heat/test_resource_group.py index c7ab15204b..6af40c9e25 100644 --- a/heat/tests/openstack/heat/test_resource_group.py +++ b/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'] diff --git a/heat/tests/openstack/heat/test_structured_config.py b/heat/tests/openstack/heat/test_structured_config.py index 2108340bf8..5aae184d2b 100644 --- a/heat/tests/openstack/heat/test_structured_config.py +++ b/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'] diff --git a/heat/tests/openstack/heat/test_swiftsignal.py b/heat/tests/openstack/heat/test_swiftsignal.py index bb8ded6292..0dc57451ad 100644 --- a/heat/tests/openstack/heat/test_swiftsignal.py +++ b/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') diff --git a/heat/tests/openstack/magnum/test_bay.py b/heat/tests/openstack/magnum/test_bay.py index ee7d4fdf94..5fcfc57aed 100644 --- a/heat/tests/openstack/magnum/test_bay.py +++ b/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) diff --git a/heat/tests/openstack/magnum/test_baymodel.py b/heat/tests/openstack/magnum/test_baymodel.py index b7bd8850b9..fbc25d0dfa 100644 --- a/heat/tests/openstack/magnum/test_baymodel.py +++ b/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) diff --git a/heat/tests/openstack/manila/test_security_service.py b/heat/tests/openstack/manila/test_security_service.py index dc5c02085d..f5eee8e1a5 100644 --- a/heat/tests/openstack/manila/test_security_service.py +++ b/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) diff --git a/heat/tests/openstack/manila/test_share.py b/heat/tests/openstack/manila/test_share.py index 5872cdbc1a..0286d8593d 100644 --- a/heat/tests/openstack/manila/test_share.py +++ b/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( diff --git a/heat/tests/openstack/manila/test_share_network.py b/heat/tests/openstack/manila/test_share_network.py index 50a53d3203..684b618ac9 100644 --- a/heat/tests/openstack/manila/test_share_network.py +++ b/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) diff --git a/heat/tests/openstack/manila/test_share_type.py b/heat/tests/openstack/manila/test_share_type.py index b69632cfa3..804934e02a 100644 --- a/heat/tests/openstack/manila/test_share_type.py +++ b/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) diff --git a/heat/tests/openstack/mistral/test_cron_trigger.py b/heat/tests/openstack/mistral/test_cron_trigger.py index 7f64f3bc09..248cffa3d9 100644 --- a/heat/tests/openstack/mistral/test_cron_trigger.py +++ b/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) diff --git a/heat/tests/openstack/mistral/test_workflow.py b/heat/tests/openstack/mistral/test_workflow.py index 8e9d9c0082..ae75c8a4b7 100644 --- a/heat/tests/openstack/mistral/test_workflow.py +++ b/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') diff --git a/heat/tests/openstack/neutron/lbaas/test_health_monitor.py b/heat/tests/openstack/neutron/lbaas/test_health_monitor.py index c25d79de5b..bed3e2b459 100644 --- a/heat/tests/openstack/neutron/lbaas/test_health_monitor.py +++ b/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): diff --git a/heat/tests/openstack/neutron/lbaas/test_listener.py b/heat/tests/openstack/neutron/lbaas/test_listener.py index 5acafd3d58..c28c426dcf 100644 --- a/heat/tests/openstack/neutron/lbaas/test_listener.py +++ b/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, diff --git a/heat/tests/openstack/neutron/lbaas/test_loadbalancer.py b/heat/tests/openstack/neutron/lbaas/test_loadbalancer.py index fb73813b07..24bb7047da 100644 --- a/heat/tests/openstack/neutron/lbaas/test_loadbalancer.py +++ b/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, diff --git a/heat/tests/openstack/neutron/lbaas/test_pool.py b/heat/tests/openstack/neutron/lbaas/test_pool.py index 602f753371..4d466e9290 100644 --- a/heat/tests/openstack/neutron/lbaas/test_pool.py +++ b/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, diff --git a/heat/tests/openstack/neutron/test_address_scope.py b/heat/tests/openstack/neutron/test_address_scope.py index d4c77e1750..1473501c51 100644 --- a/heat/tests/openstack/neutron/test_address_scope.py +++ b/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, diff --git a/heat/tests/openstack/neutron/test_qos.py b/heat/tests/openstack/neutron/test_qos.py index be77fca065..a5da3785da 100644 --- a/heat/tests/openstack/neutron/test_qos.py +++ b/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, diff --git a/heat/tests/openstack/trove/test_cluster.py b/heat/tests/openstack/trove/test_cluster.py index 7cb947d938..97fe70c56d 100644 --- a/heat/tests/openstack/trove/test_cluster.py +++ b/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)