tests make dummy db setup/reset consistent

Move the setup/reset of the dummy DB into the test common base-class,
which ensures the setup/recent happens consistently (some tests setup
but then don't reset for example), and ensures there's always a clean
dummy DB per test.

Change-Id: I8e3bdd23399cb0d1d3c93daae66e6509b12b4e72
This commit is contained in:
Steven Hardy 2014-04-25 17:37:38 +01:00
parent db7d45f6a4
commit 93d9594d7a
70 changed files with 6 additions and 150 deletions

View File

@ -49,7 +49,6 @@ class DockerContainerTest(HeatTestCase):
def setUp(self):
super(DockerContainerTest, self).setUp()
utils.setup_dummy_db()
for res_name, res_class in docker_container.resource_mapping().items():
resource._register_class(res_name, res_class)

View File

@ -67,8 +67,6 @@ class NeutronExtraRouteTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'update_router')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
resource._register_class("OS::Neutron::ExtraRoute",
extraroute.ExtraRoute)

View File

@ -71,7 +71,6 @@ class MarconiMessageQueueTest(HeatTestCase):
def setUp(self):
super(MarconiMessageQueueTest, self).setUp()
self.fc = self.m.CreateMockAnything()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
resource._register_class("OS::Marconi::Queue",
queue.MarconiQueue)

View File

@ -198,7 +198,6 @@ class ScalingGroupTest(HeatTestCase):
def setUp(self):
super(ScalingGroupTest, self).setUp()
utils.setup_dummy_db()
for res_name, res_class in auto_scale.resource_mapping().items():
resource._register_class(res_name, res_class)
self.fake_auto_scale = FakeAutoScale()
@ -350,7 +349,6 @@ class PolicyTest(HeatTestCase):
def setUp(self):
super(PolicyTest, self).setUp()
utils.setup_dummy_db()
for res_name, res_class in auto_scale.resource_mapping().items():
resource._register_class(res_name, res_class)
self.fake_auto_scale = FakeAutoScale()
@ -492,7 +490,6 @@ class WebHookTest(HeatTestCase):
def setUp(self):
super(WebHookTest, self).setUp()
utils.setup_dummy_db()
for res_name, res_class in auto_scale.resource_mapping().items():
resource._register_class(res_name, res_class)
self.fake_auto_scale = FakeAutoScale()

View File

@ -203,7 +203,6 @@ class LoadBalancerTest(HeatTestCase):
}
lb.resource_mapping = override_resource
utils.setup_dummy_db()
resource._register_class("Rackspace::Cloud::LoadBalancer",
LoadBalancerWithFakeClient)

View File

@ -89,7 +89,6 @@ class CloudNetworkTest(HeatTestCase):
def setUp(self):
super(CloudNetworkTest, self).setUp()
utils.setup_dummy_db()
resource._register_class("Rackspace::Cloud::Network",
cloudnetworks.CloudNetwork)

View File

@ -79,7 +79,6 @@ class CloudServersTest(HeatTestCase):
def setUp(self):
super(CloudServersTest, self).setUp()
self.fc = fakes.FakeClient()
utils.setup_dummy_db()
# Test environment may not have pyrax client library installed and if
# pyrax is not installed resource class would not be registered.
# So register resource provider class explicitly for unit testing.

View File

@ -80,7 +80,6 @@ class RackspaceDnsTest(common.HeatTestCase):
def setUp(self):
super(RackspaceDnsTest, self).setUp()
utils.setup_dummy_db()
# Test environment may not have pyrax client library installed and if
# pyrax is not installed resource class would not be registered.
# So register resource provider class explicitly for unit testing.

View File

@ -27,6 +27,7 @@ from heat.engine import environment
from heat.engine import resources
from heat.engine import scheduler
from heat.openstack.common.fixture import mockpatch
from heat.tests import utils
class HeatTestCase(testscenarios.WithScenarios, testtools.TestCase):
@ -67,6 +68,8 @@ class HeatTestCase(testscenarios.WithScenarios, testtools.TestCase):
if templ_path not in cur_path:
tri.template_name = cur_path.replace('/etc/heat/templates',
templ_path)
utils.setup_dummy_db()
self.addCleanup(utils.reset_dummy_db)
def stub_wallclock(self):
"""

View File

@ -128,7 +128,6 @@ class AutoScalingTest(HeatTestCase):
def setUp(self):
super(AutoScalingTest, self).setUp()
utils.setup_dummy_db()
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://server.test:8000/v1/waitcondition')
self.fc = fakes.FakeKeystoneClient()
@ -1699,7 +1698,6 @@ class TestInstanceGroup(HeatTestCase):
def setUp(self):
super(TestInstanceGroup, self).setUp()
utils.setup_dummy_db()
json_snippet = {'Properties':
{'Size': 2, 'LaunchConfigurationName': 'foo'}}

View File

@ -209,7 +209,6 @@ class AutoScalingGroupTest(HeatTestCase):
self.fkc = fakes.FakeKeystoneClient(username='test_stack.CfnLBUser')
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://127.0.0.1:8000/v1/waitcondition')
utils.setup_dummy_db()
def _stub_validate(self):
self.m.StubOutWithMock(parser.Stack, 'validate')

View File

@ -131,7 +131,6 @@ class FakeCeilometerClient(object):
class CeilometerAlarmTest(HeatTestCase):
def setUp(self):
super(CeilometerAlarmTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('SignalResourceType',
generic_resource.SignalResource)
@ -338,7 +337,6 @@ class CombinationAlarmTest(HeatTestCase):
super(CombinationAlarmTest, self).setUp()
self.fc = FakeCeilometerClient()
self.m.StubOutWithMock(clients.OpenStackClients, 'ceilometer')
utils.setup_dummy_db()
def create_alarm(self):
clients.OpenStackClients.ceilometer().MultipleTimes().AndReturn(

View File

@ -26,7 +26,6 @@ class CloudConfigTest(HeatTestCase):
def setUp(self):
super(CloudConfigTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.properties = {
'cloud_config': {'foo': 'bar'}

View File

@ -42,7 +42,6 @@ class CloudWatchAlarmTest(common.HeatTestCase):
def setUp(self):
super(CloudWatchAlarmTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
def parse_stack(self):

View File

@ -52,7 +52,6 @@ alarm_template = '''
class CloudWatchAlarmTest(HeatTestCase):
def setUp(self):
super(CloudWatchAlarmTest, self).setUp()
utils.setup_dummy_db()
def create_alarm(self, t, stack, resource_name):
rsrc = cloud_watch.CloudWatchAlarm(resource_name,

View File

@ -103,7 +103,6 @@ class DBInstance(resource.Resource):
class DBInstanceTest(HeatTestCase):
def setUp(self):
super(DBInstanceTest, self).setUp()
utils.setup_dummy_db()
def test_dbinstance(self):
"""test that the Template is parsable and

View File

@ -154,7 +154,6 @@ class EIPTest(HeatTestCase):
self.m.StubOutWithMock(eip.ElasticIp, 'nova')
self.m.StubOutWithMock(eip.ElasticIpAssociation, 'nova')
self.m.StubOutWithMock(self.fc.servers, 'get')
utils.setup_dummy_db()
def tearDown(self):
super(EIPTest, self).tearDown()
@ -308,8 +307,6 @@ class AllocTest(HeatTestCase):
'remove_gateway_router')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def mock_show_network(self):
vpc_name = utils.PhysName('test_stack', 'the_vpc')
clients.neutronclient.Client.show_network(

View File

@ -111,7 +111,6 @@ class EngineApiTest(HeatTestCase):
class FormatTest(HeatTestCase):
def setUp(self):
super(FormatTest, self).setUp()
utils.setup_dummy_db()
template = parser.Template({
'Resources': {

View File

@ -307,7 +307,6 @@ class DummyThreadGroup(object):
class StackCreateTest(HeatTestCase):
def setUp(self):
super(StackCreateTest, self).setUp()
utils.setup_dummy_db()
def test_wordpress_single_instance_stack_create(self):
stack = get_wordpress_stack('test_stack', utils.dummy_context())
@ -403,8 +402,6 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
def setUp(self):
super(StackServiceCreateUpdateDeleteTest, self).setUp()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.ctx = utils.dummy_context()
self.m.StubOutWithMock(service.EngineListener, 'start')
@ -1200,8 +1197,6 @@ class StackServiceUpdateNotSupportedTest(HeatTestCase):
def setUp(self):
super(StackServiceUpdateNotSupportedTest, self).setUp()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.ctx = utils.dummy_context()
self.m.StubOutWithMock(service.EngineListener, 'start')
@ -1239,7 +1234,6 @@ class StackServiceSuspendResumeTest(HeatTestCase):
def setUp(self):
super(StackServiceSuspendResumeTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.m.StubOutWithMock(service.EngineListener, 'start')
@ -1326,8 +1320,6 @@ class StackServiceAuthorizeTest(HeatTestCase):
res._register_class('ResourceWithPropsType',
generic_rsrc.ResourceWithProps)
utils.setup_dummy_db()
@stack_context('service_authorize_stack_user_nocreds_test_stack')
def test_stack_authorize_stack_user_nocreds(self):
self.assertFalse(self.eng._authorize_stack_user(self.ctx,
@ -1426,8 +1418,6 @@ class StackServiceTest(HeatTestCase):
res._register_class('ResourceWithPropsType',
generic_rsrc.ResourceWithProps)
utils.setup_dummy_db()
@mock.patch.object(service.db_api, 'stack_get_all')
@mock.patch.object(service.service.Service, 'start')
def test_start_gets_all_stacks(self, mock_super_start, mock_stack_get_all):
@ -2683,7 +2673,6 @@ class SoftwareConfigServiceTest(HeatTestCase):
service.EngineListener.start().AndReturn(None)
self.m.ReplayAll()
self.engine = service.EngineService('a-host', 'a-topic')
utils.setup_dummy_db()
def _create_software_config(
self, group='Heat::Shell', name='config_mysql', config=None,

View File

@ -41,7 +41,6 @@ class EventTest(HeatTestCase):
super(EventTest, self).setUp()
self.username = 'event_test_user'
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.m.ReplayAll()

View File

@ -46,7 +46,6 @@ class AutoScalingGroupTest(HeatTestCase):
def setUp(self):
super(AutoScalingGroupTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('ResourceWithProps',
generic_resource.ResourceWithProps)
cfg.CONF.set_default('heat_waitcondition_server_url',
@ -274,7 +273,6 @@ class HeatScalingGroupWithCFNScalingPolicyTest(HeatTestCase):
def setUp(self):
super(HeatScalingGroupWithCFNScalingPolicyTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('ResourceWithProps',
generic_resource.ResourceWithProps)
cfg.CONF.set_default('heat_waitcondition_server_url',
@ -333,7 +331,6 @@ class ScalingPolicyTest(HeatTestCase):
def setUp(self):
super(ScalingPolicyTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('ResourceWithProps',
generic_resource.ResourceWithProps)
self.fc = fakes.FakeKeystoneClient()

View File

@ -783,7 +783,6 @@ class StackAttributesTest(HeatTestCase):
def setUp(self):
super(StackAttributesTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
resource._register_class('GenericResourceType',

View File

@ -68,7 +68,6 @@ class InstancesTest(HeatTestCase):
def setUp(self):
super(InstancesTest, self).setUp()
self.fc = fakes.FakeClient()
utils.setup_dummy_db()
def _setup_test_stack(self, stack_name):
t = template_format.parse(wp_template)

View File

@ -61,7 +61,6 @@ ig_template = '''
class InstanceGroupTest(HeatTestCase):
def setUp(self):
super(InstanceGroupTest, self).setUp()
utils.setup_dummy_db()
def _stub_create(self, num, instance_class=instance.Instance):
"""

View File

@ -160,7 +160,6 @@ class InstanceGroupTest(HeatTestCase):
def setUp(self):
super(InstanceGroupTest, self).setUp()
self.fc = fakes.FakeClient()
utils.setup_dummy_db()
def _stub_validate(self):
self.m.StubOutWithMock(parser.Stack, 'validate')

View File

@ -148,7 +148,6 @@ class instancesTest(HeatTestCase):
def setUp(self):
super(instancesTest, self).setUp()
self.fc = fakes.FakeClient()
utils.setup_dummy_db()
def _create_test_instance(self, return_server, name):
stack_name = '%s_s' % name

View File

@ -13,14 +13,12 @@
from heat.common import timeutils as util
from heat.tests.common import HeatTestCase
from heat.tests import utils
class ISO8601UtilityTest(HeatTestCase):
def setUp(self):
super(ISO8601UtilityTest, self).setUp()
utils.setup_dummy_db()
def test_valid_durations(self):
self.assertEqual(0, util.parse_isoduration('PT'))

View File

@ -112,7 +112,6 @@ class LoadBalancerTest(HeatTestCase):
cfg.CONF.set_default('heat_waitcondition_server_url',
'http://server.test:8000/v1/waitcondition')
utils.setup_dummy_db()
def create_loadbalancer(self, t, stack, resource_name):
rsrc = lb.LoadBalancer(resource_name,

View File

@ -133,7 +133,6 @@ class MetadataRefreshTest(HeatTestCase):
def setUp(self):
super(MetadataRefreshTest, self).setUp()
self.fc = fakes.FakeKeystoneClient()
utils.setup_dummy_db()
# Note tests creating a stack should be decorated with @stack_delete_after
# to ensure the stack is properly cleaned up
@ -198,7 +197,6 @@ class MetadataRefreshTest(HeatTestCase):
class WaitCondMetadataUpdateTest(HeatTestCase):
def setUp(self):
super(WaitCondMetadataUpdateTest, self).setUp()
utils.setup_dummy_db()
self.fc = fakes.FakeKeystoneClient()
self.m.StubOutWithMock(service.EngineListener, 'start')

View File

@ -28,7 +28,6 @@ class MultipartMimeTest(HeatTestCase):
def setUp(self):
super(MultipartMimeTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.init_config()

View File

@ -68,7 +68,6 @@ Outputs:
def setUp(self):
super(NestedStackTest, self).setUp()
self.m.StubOutWithMock(urlfetch, 'get')
utils.setup_dummy_db()
def create_stack(self, template):
t = template_format.parse(template)

View File

@ -375,7 +375,6 @@ class NeutronNetTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client,
'list_dhcp_agent_hosting_networks')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_net(self, t, stack, resource_name):
rsrc = net.Net('test_net', t['Resources'][resource_name], stack)
@ -578,7 +577,6 @@ class NeutronProviderNetTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'delete_network')
self.m.StubOutWithMock(neutronclient.Client, 'update_network')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_provider_net(self):
clients.OpenStackClients.keystone().AndReturn(
@ -701,7 +699,6 @@ class NeutronSubnetTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_subnet')
self.m.StubOutWithMock(neutronclient.Client, 'update_subnet')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_subnet(self, t, stack, resource_name):
rsrc = subnet.Subnet('test_subnet', t['Resources'][resource_name],
@ -979,7 +976,6 @@ class NeutronRouterTest(HeatTestCase):
self.m.StubOutWithMock(router.neutronV20,
'find_resourceid_by_name_or_id')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_router(self, t, stack, resource_name):
rsrc = router.Router('router', t['Resources'][resource_name], stack)
@ -1577,7 +1573,6 @@ class NeutronFloatingIPTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'update_port')
self.m.StubOutWithMock(neutronclient.Client, 'show_port')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def test_floating_ip(self):
@ -1848,7 +1843,6 @@ class NeutronPortTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'create_port')
self.m.StubOutWithMock(neutronclient.Client, 'show_port')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def test_missing_subnet_id(self):
clients.OpenStackClients.keystone().AndReturn(

View File

@ -110,7 +110,6 @@ class AutoScalingTest(HeatTestCase):
def setUp(self):
super(AutoScalingTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.fc = v1fakes.FakeClient()

View File

@ -96,7 +96,6 @@ class FirewallTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_firewall')
self.m.StubOutWithMock(neutronclient.Client, 'update_firewall')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_firewall(self):
clients.OpenStackClients.keystone().AndReturn(
@ -227,7 +226,6 @@ class FirewallPolicyTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_firewall_policy')
self.m.StubOutWithMock(neutronclient.Client, 'update_firewall_policy')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_firewall_policy(self):
clients.OpenStackClients.keystone().AndReturn(
@ -357,7 +355,6 @@ class FirewallRuleTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_firewall_rule')
self.m.StubOutWithMock(neutronclient.Client, 'update_firewall_rule')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_firewall_rule(self):
clients.OpenStackClients.keystone().AndReturn(

View File

@ -206,7 +206,6 @@ class HealthMonitorTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_health_monitor')
self.m.StubOutWithMock(neutronclient.Client, 'update_health_monitor')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_health_monitor(self):
clients.OpenStackClients.keystone().AndReturn(
@ -344,7 +343,6 @@ class PoolTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'delete_vip')
self.m.StubOutWithMock(neutronclient.Client, 'show_vip')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_pool(self, with_vip_subnet=False):
clients.OpenStackClients.keystone().AndReturn(
@ -782,7 +780,6 @@ class PoolMemberTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'update_member')
self.m.StubOutWithMock(neutronclient.Client, 'show_member')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_member(self):
clients.OpenStackClients.keystone().AndReturn(
@ -887,7 +884,6 @@ class LoadBalancerTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'delete_member')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
self.m.StubOutWithMock(clients.OpenStackClients, 'nova')
utils.setup_dummy_db()
def create_load_balancer(self):
clients.OpenStackClients.keystone().AndReturn(
@ -988,7 +984,6 @@ class PoolUpdateHealthMonitorsTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'delete_vip')
self.m.StubOutWithMock(neutronclient.Client, 'show_vip')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def _create_pool_with_health_monitors(self):
clients.OpenStackClients.keystone().MultipleTimes().AndReturn(

View File

@ -67,7 +67,6 @@ class MeteringLabelTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client,
'show_metering_label_rule')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_metering_label(self):
clients.OpenStackClients.keystone().AndReturn(
@ -180,7 +179,6 @@ class MeteringRuleTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client,
'show_metering_label_rule')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_metering_label_rule(self):
clients.OpenStackClients.keystone().AndReturn(

View File

@ -86,7 +86,6 @@ class NeutronNetworkGatewayTest(HeatTestCase):
'disconnect_network_gateway')
self.m.StubOutWithMock(neutronclient.Client, 'list_networks')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def prepare_create_network_gateway(self):
clients.OpenStackClients.keystone().AndReturn(

View File

@ -95,7 +95,6 @@ Resources:
self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'delete')
self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'get')
self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'list')
utils.setup_dummy_db()
self.m.StubOutWithMock(neutronclient.Client, 'create_security_group')
self.m.StubOutWithMock(
neutronclient.Client, 'create_security_group_rule')

View File

@ -153,7 +153,6 @@ class VPNServiceTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_vpnservice')
self.m.StubOutWithMock(neutronclient.Client, 'update_vpnservice')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_vpnservice(self):
clients.OpenStackClients.keystone().AndReturn(
@ -308,7 +307,6 @@ class IPsecSiteConnectionTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client,
'update_ipsec_site_connection')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_ipsec_site_connection(self):
clients.OpenStackClients.keystone().AndReturn(
@ -467,7 +465,6 @@ class IKEPolicyTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_ikepolicy')
self.m.StubOutWithMock(neutronclient.Client, 'update_ikepolicy')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_ikepolicy(self):
clients.OpenStackClients.keystone().AndReturn(
@ -620,7 +617,6 @@ class IPsecPolicyTest(HeatTestCase):
self.m.StubOutWithMock(neutronclient.Client, 'show_ipsecpolicy')
self.m.StubOutWithMock(neutronclient.Client, 'update_ipsecpolicy')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_ipsecpolicy(self):
clients.OpenStackClients.keystone().AndReturn(

View File

@ -44,7 +44,6 @@ class nokeyTest(HeatTestCase):
def setUp(self):
super(nokeyTest, self).setUp()
self.fc = fakes.FakeClient()
utils.setup_dummy_db()
def test_nokey_create(self):

View File

@ -42,7 +42,6 @@ class NotificationTest(common.HeatTestCase):
def setUp(self):
super(NotificationTest, self).setUp()
utils.setup_dummy_db()
cfg.CONF.import_opt('notification_driver',
'heat.openstack.common.notifier.api')
@ -160,7 +159,6 @@ class ScaleNotificationTest(common.HeatTestCase):
def setUp(self):
super(ScaleNotificationTest, self).setUp()
utils.setup_dummy_db()
cfg.CONF.import_opt('notification_driver',
'heat.openstack.common.notifier.api')

View File

@ -67,8 +67,6 @@ class NovaFloatingIPTest(HeatTestCase):
self.m.StubOutWithMock(self.novaclient.servers, 'remove_floating_ip')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def _make_obj(self, **kwargs):
mock = self.m.CreateMockAnything()
for k, v in kwargs.iteritems():

View File

@ -40,7 +40,6 @@ class NovaKeyPairTest(HeatTestCase):
def setUp(self):
super(NovaKeyPairTest, self).setUp()
utils.setup_dummy_db()
self.fake_nova = self.m.CreateMockAnything()
self.fake_keypairs = self.m.CreateMockAnything()
self.fake_nova.keypairs = self.fake_keypairs

View File

@ -90,7 +90,6 @@ class OSDBInstanceTest(HeatTestCase):
def setUp(self):
super(OSDBInstanceTest, self).setUp()
self.fc = self.m.CreateMockAnything()
utils.setup_dummy_db()
def _setup_test_clouddbinstance(self, name, parsed_t):
stack_name = '%s_stack' % name

View File

@ -739,7 +739,6 @@ class ResolveDataTest(HeatTestCase):
super(ResolveDataTest, self).setUp()
self.username = 'parser_stack_test_user'
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.stack = parser.Stack(self.ctx, 'resolve_test_stack',
@ -844,7 +843,6 @@ class StackTest(HeatTestCase):
self.username = 'parser_stack_test_user'
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
resource._register_class('GenericResourceType',

View File

@ -38,7 +38,6 @@ class MyCloudResource(generic_rsrc.GenericResource):
class ProviderTemplateTest(HeatTestCase):
def setUp(self):
super(ProviderTemplateTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('OS::ResourceType',
generic_rsrc.GenericResource)
resource._register_class('myCloud::ResourceType',
@ -677,7 +676,6 @@ Outputs:
def setUp(self):
super(ProviderTemplateUpdateTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context('test_username', 'aaaa', 'password')
def create_stack(self):

View File

@ -43,7 +43,6 @@ Resources:
def setUp(self):
super(HeatTestCase, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
def create_stack(self, template):

View File

@ -35,7 +35,6 @@ from heat.tests import utils
class ResourceTest(HeatTestCase):
def setUp(self):
super(ResourceTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('GenericResourceType',
generic_rsrc.GenericResource)
@ -745,7 +744,6 @@ class ResourceTest(HeatTestCase):
class ResourceAdoptTest(HeatTestCase):
def setUp(self):
super(ResourceAdoptTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('GenericResourceType',
generic_rsrc.GenericResource)
@ -829,7 +827,6 @@ class ResourceAdoptTest(HeatTestCase):
class ResourceDependenciesTest(HeatTestCase):
def setUp(self):
super(ResourceDependenciesTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('GenericResourceType',
generic_rsrc.GenericResource)
@ -1297,7 +1294,6 @@ class MetadataTest(HeatTestCase):
'Type': 'Foo',
'Metadata': {'Test': 'Initial metadata'}
}
utils.setup_dummy_db()
self.stack = parser.Stack(utils.dummy_context(),
'test_stack', parser.Template({}))
self.stack.store()

View File

@ -77,7 +77,6 @@ class ResourceGroupTest(common.HeatTestCase):
common.HeatTestCase.setUp(self)
resource._register_class("dummy.resource",
ResourceWithPropsAndId)
utils.setup_dummy_db()
def test_assemble_nested(self):
"""

View File

@ -41,7 +41,6 @@ restarter_template = '''
class RestarterTest(common.HeatTestCase):
def setUp(self):
super(RestarterTest, self).setUp()
utils.setup_dummy_db()
def create_restarter(self):
snippet = template_format.parse(restarter_template)

View File

@ -77,8 +77,6 @@ class s3Test(HeatTestCase):
self.m.StubOutWithMock(swiftclient.Connection, 'get_auth')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_resource(self, t, stack, resource_name):
rsrc = s3.S3Bucket('test_resource',
t['Resources'][resource_name],

View File

@ -137,7 +137,6 @@ Resources:
self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'delete')
self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'get')
self.m.StubOutWithMock(nova_sg.SecurityGroupManager, 'list')
utils.setup_dummy_db()
self.m.StubOutWithMock(neutronclient.Client, 'create_security_group')
self.m.StubOutWithMock(
neutronclient.Client, 'create_security_group_rule')

View File

@ -70,7 +70,6 @@ class ServersTest(HeatTestCase):
self.fc = fakes_v1_1.FakeClient()
self.fkc = fakes.FakeKeystoneClient()
utils.setup_dummy_db()
self.limits = self.m.CreateMockAnything()
self.limits.absolute = self._limits_absolute()

View File

@ -128,7 +128,6 @@ class ServerTagsTest(HeatTestCase):
def setUp(self):
super(ServerTagsTest, self).setUp()
self.fc = fakes.FakeClient()
utils.setup_dummy_db()
def _setup_test_instance(self, intags=None, nova_tags=None):
stack_name = 'tag_test'

View File

@ -50,7 +50,6 @@ class SignalTest(HeatTestCase):
def setUp(self):
super(SignalTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('SignalResourceType',
generic_resource.SignalResource)
@ -65,7 +64,6 @@ class SignalTest(HeatTestCase):
def tearDown(self):
super(SignalTest, self).tearDown()
utils.reset_dummy_db()
# Note tests creating a stack should be decorated with @stack_delete_after
# to ensure the stack is properly cleaned up

View File

@ -28,7 +28,6 @@ class SoftwareConfigTest(HeatTestCase):
def setUp(self):
super(SoftwareConfigTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.properties = {
'group': 'Heat::Shell',

View File

@ -68,7 +68,6 @@ class SoftwareDeploymentTest(HeatTestCase):
def setUp(self):
super(SoftwareDeploymentTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
def _create_stack(self, tmpl):

View File

@ -89,8 +89,6 @@ class SqlAlchemyTest(HeatTestCase):
def setUp(self):
super(SqlAlchemyTest, self).setUp()
self.fc = fakes.FakeClient()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.ctx = utils.dummy_context()
def tearDown(self):
@ -901,7 +899,6 @@ class DBAPIRawTemplateTest(HeatTestCase):
def setUp(self):
super(DBAPIRawTemplateTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
def test_raw_template_create(self):
t = template_format.parse(wp_template)
@ -922,7 +919,6 @@ class DBAPIUserCredsTest(HeatTestCase):
def setUp(self):
super(DBAPIUserCredsTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
def test_user_creds_create_trust(self):
user_creds = create_user_creds(self.ctx, trust_id='test_trust_id',
@ -972,8 +968,6 @@ class DBAPIStackTest(HeatTestCase):
def setUp(self):
super(DBAPIStackTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.template = create_raw_template(self.ctx)
self.user_creds = create_user_creds(self.ctx)
@ -1227,8 +1221,6 @@ class DBAPIResourceTest(HeatTestCase):
def setUp(self):
super(DBAPIResourceTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.template = create_raw_template(self.ctx)
self.user_creds = create_user_creds(self.ctx)
self.stack = create_stack(self.ctx, self.template, self.user_creds)
@ -1313,8 +1305,6 @@ class DBAPIStackLockTest(HeatTestCase):
def setUp(self):
super(DBAPIStackLockTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.template = create_raw_template(self.ctx)
self.user_creds = create_user_creds(self.ctx)
self.stack = create_stack(self.ctx, self.template, self.user_creds)
@ -1375,8 +1365,6 @@ class DBAPIResourceDataTest(HeatTestCase):
def setUp(self):
super(DBAPIResourceDataTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.template = create_raw_template(self.ctx)
self.user_creds = create_user_creds(self.ctx)
self.stack = create_stack(self.ctx, self.template, self.user_creds)
@ -1428,8 +1416,6 @@ class DBAPIEventTest(HeatTestCase):
def setUp(self):
super(DBAPIEventTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.template = create_raw_template(self.ctx)
self.user_creds = create_user_creds(self.ctx)
@ -1524,8 +1510,6 @@ class DBAPIWatchRuleTest(HeatTestCase):
def setUp(self):
super(DBAPIWatchRuleTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.template = create_raw_template(self.ctx)
self.user_creds = create_user_creds(self.ctx)
self.stack = create_stack(self.ctx, self.template, self.user_creds)
@ -1606,8 +1590,6 @@ class DBAPIWatchDataTest(HeatTestCase):
def setUp(self):
super(DBAPIWatchDataTest, self).setUp()
self.ctx = utils.dummy_context()
utils.setup_dummy_db()
utils.reset_dummy_db()
self.template = create_raw_template(self.ctx)
self.user_creds = create_user_creds(self.ctx)
self.stack = create_stack(self.ctx, self.template, self.user_creds)

View File

@ -23,7 +23,6 @@ from heat.tests import utils
class StackLockTest(HeatTestCase):
def setUp(self):
super(StackLockTest, self).setUp()
utils.setup_dummy_db()
self.context = utils.dummy_context()
self.stack = self.m.CreateMockAnything()
self.stack.id = "aae01f2d-52ae-47ac-8a0d-3fde3d220fea"

View File

@ -101,7 +101,6 @@ class StackResourceTest(HeatTestCase):
def setUp(self):
super(StackResourceTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('some_magic_type',
MyStackResource)
resource._register_class('GenericResource',

View File

@ -40,14 +40,12 @@ class StackUserTest(HeatTestCase):
def setUp(self):
super(StackUserTest, self).setUp()
utils.setup_dummy_db()
resource._register_class('StackUserResourceType',
generic_resource.StackUserResource)
self.fc = fakes.FakeKeystoneClient()
def tearDown(self):
super(StackUserTest, self).tearDown()
utils.reset_dummy_db()
def _user_create(self, stack_name, project_id, user_id,
resource_name='user', create_project=True):

View File

@ -35,7 +35,6 @@ class StructuredConfigTestJSON(HeatTestCase):
def setUp(self):
super(StructuredConfigTestJSON, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
self.properties = {
'config': {'foo': 'bar'}
@ -80,7 +79,6 @@ class StructuredDeploymentDerivedTest(HeatTestCase):
def setUp(self):
super(StructuredDeploymentDerivedTest, self).setUp()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
props = {
'input_values': {'bar': 'baz'},

View File

@ -80,8 +80,6 @@ class swiftTest(HeatTestCase):
self.m.StubOutWithMock(swiftclient.Connection, 'get_auth')
self.m.StubOutWithMock(clients.OpenStackClients, 'keystone')
utils.setup_dummy_db()
def create_resource(self, t, stack, resource_name):
rsrc = swift.SwiftContainer(
'test_resource',

View File

@ -160,7 +160,6 @@ class JsonYamlResolvedCompareTest(HeatTestCase):
super(JsonYamlResolvedCompareTest, self).setUp()
self.longMessage = True
self.maxDiff = None
utils.setup_dummy_db()
def load_template(self, file_name):
filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)),

View File

@ -107,7 +107,6 @@ class UserTest(HeatTestCase):
self.username = 'test_stack-CfnUser-aabbcc'
self.fc = fakes.FakeKeystoneClient(username=self.username)
cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role')
utils.setup_dummy_db()
def create_user(self, t, stack, resource_name,
project_id='stackproject', user_id='dummy_user',
@ -276,7 +275,6 @@ class UserTest(HeatTestCase):
class AccessKeyTest(HeatTestCase):
def setUp(self):
super(AccessKeyTest, self).setUp()
utils.setup_dummy_db()
self.username = utils.PhysName('test_stack', 'CfnUser')
self.credential_id = 'acredential123'
self.fc = fakes.FakeKeystoneClient(username=self.username,

View File

@ -781,7 +781,6 @@ class validateTest(HeatTestCase):
resources.initialise()
self.fc = fakes.FakeClient()
resources.initialise()
utils.setup_dummy_db()
self.ctx = utils.dummy_context()
def test_validate_volumeattach_valid(self):

View File

@ -95,7 +95,6 @@ class VolumeTest(HeatTestCase):
self.m.StubOutWithMock(self.fc.volumes, 'delete_server_volume')
self.m.StubOutWithMock(self.fc.volumes, 'get_server_volume')
self.m.StubOutWithMock(nova_utils, 'get_image_id')
utils.setup_dummy_db()
def create_volume(self, t, stack, resource_name):
data = t['Resources'][resource_name]

View File

@ -35,7 +35,6 @@ class VPCTestBase(HeatTestCase):
@skipIf(neutronclient is None, 'neutronclient unavaialble')
def setUp(self):
super(VPCTestBase, self).setUp()
utils.setup_dummy_db()
self.m.StubOutWithMock(neutronclient.Client, 'add_interface_router')
self.m.StubOutWithMock(neutronclient.Client, 'add_gateway_router')
self.m.StubOutWithMock(neutronclient.Client, 'create_network')

View File

@ -98,7 +98,6 @@ class WaitConditionTest(HeatTestCase):
def setUp(self):
super(WaitConditionTest, self).setUp()
utils.setup_dummy_db()
self.m.StubOutWithMock(wc.WaitConditionHandle,
'get_status')
@ -107,10 +106,6 @@ class WaitConditionTest(HeatTestCase):
self.fc = fakes.FakeKeystoneClient()
def tearDown(self):
super(WaitConditionTest, self).tearDown()
utils.reset_dummy_db()
# Note tests creating a stack should be decorated with @stack_delete_after
# to ensure the stack is properly cleaned up
def create_stack(self, stack_id=None,
@ -393,11 +388,6 @@ class WaitConditionHandleTest(HeatTestCase):
'http://server.test:8000/v1/waitcondition')
self.fc = fakes.FakeKeystoneClient()
utils.setup_dummy_db()
def tearDown(self):
super(WaitConditionHandleTest, self).tearDown()
utils.reset_dummy_db()
def create_stack(self, stack_name=None, stack_id=None):
temp = template_format.parse(test_template_waitcondition)
@ -582,12 +572,10 @@ class WaitConditionUpdateTest(HeatTestCase):
'http://server.test:8000/v1/waitcondition')
self.fc = fakes.FakeKeystoneClient()
utils.setup_dummy_db()
scheduler.ENABLE_SLEEP = False
def tearDown(self):
super(WaitConditionUpdateTest, self).tearDown()
utils.reset_dummy_db()
scheduler.ENABLE_SLEEP = True
# Note tests creating a stack should be decorated with @stack_delete_after

View File

@ -39,13 +39,11 @@ class DummyAction(object):
class WatchRuleTest(HeatTestCase):
stack_id = None
@classmethod
def setUpDatabase(cls):
if cls.stack_id is not None:
def setUpDatabase(self):
if self.stack_id is not None:
return
# Create a dummy stack in the DB as WatchRule instances
# must be associated with a stack
utils.setup_dummy_db()
ctx = utils.dummy_context()
ctx.auth_token = 'abcd1234'
empty_tmpl = {"template": {}}
@ -56,7 +54,7 @@ class WatchRuleTest(HeatTestCase):
'Testing')
dummy_stack.store()
cls.stack_id = dummy_stack.id
self.stack_id = dummy_stack.id
def setUp(self):
super(WatchRuleTest, self).setUp()