openstack
/
heat
Code Issues Proposed changes

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
This commit is contained in:
Dmitriy Uvarenkov 2016-06-09 16:42:06 +03:00
parent 1e47fac48d
commit 13c338f266
25 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/tests/engine/service/test_stack_snapshot.py
View File

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

2
heat/tests/openstack/barbican/test_container.py
View File

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

2
heat/tests/openstack/barbican/test_order.py
View File

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

2
heat/tests/openstack/barbican/test_secret.py
View File

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

2
heat/tests/openstack/glance/test_image.py
View File

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

2
heat/tests/openstack/heat/test_cw_alarm.py
View File

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

4
heat/tests/openstack/heat/test_random_string.py
View File

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

9
heat/tests/openstack/heat/test_resource_group.py
View File

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

9
heat/tests/openstack/heat/test_structured_config.py
View File

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

6
heat/tests/openstack/heat/test_swiftsignal.py
View File

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

1
heat/tests/openstack/magnum/test_bay.py
View File

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

1
heat/tests/openstack/magnum/test_baymodel.py
View File

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

4
heat/tests/openstack/manila/test_security_service.py
View File

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

2
heat/tests/openstack/manila/test_share.py
View File

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

2
heat/tests/openstack/manila/test_share_network.py
View File

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

7
heat/tests/openstack/manila/test_share_type.py
View File

@ -16,7 +16,6 @@ import copy
import mock import mock
from heat.common import template_format 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.resources.openstack.manila import share_type as mshare_type
from heat.engine import rsrc_defn from heat.engine import rsrc_defn
from heat.engine import scheduler from heat.engine import scheduler
@ -44,12 +43,6 @@ class DummyShare(object):
class ManilaShareTypeTest(common.HeatTestCase): 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"): def _init_share(self, stack_name, share_type_name="test_share_type"):
# parse stack # parse stack
tmp = template_format.parse(manila_template) tmp = template_format.parse(manila_template)

4
heat/tests/openstack/mistral/test_cron_trigger.py
View File

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

3
heat/tests/openstack/mistral/test_workflow.py
View File

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

3
heat/tests/openstack/neutron/lbaas/test_health_monitor.py
View File

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

3
heat/tests/openstack/neutron/lbaas/test_listener.py
View File

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

3
heat/tests/openstack/neutron/lbaas/test_loadbalancer.py
View File

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

3
heat/tests/openstack/neutron/lbaas/test_pool.py
View File

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

2
heat/tests/openstack/neutron/test_address_scope.py
View File

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

6
heat/tests/openstack/neutron/test_qos.py
View File

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

2
heat/tests/openstack/trove/test_cluster.py
View File

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