From 93d9594d7abb17977de273b97ed9efbe29bb7845 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 25 Apr 2014 17:37:38 +0100 Subject: [PATCH] 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 --- .../docker/tests/test_docker_container.py | 1 - .../extraroute/tests/test_extraroute.py | 2 -- contrib/marconi/marconi/tests/test_queue.py | 1 - .../rackspace/tests/test_auto_scale.py | 3 --- .../rackspace/tests/test_cloud_loadbalancer.py | 1 - .../rackspace/tests/test_cloudnetworks.py | 1 - .../tests/test_rackspace_cloud_server.py | 1 - .../rackspace/tests/test_rackspace_dns.py | 1 - heat/tests/common.py | 3 +++ heat/tests/test_autoscaling.py | 2 -- heat/tests/test_autoscaling_update_policy.py | 1 - heat/tests/test_ceilometer_alarm.py | 2 -- heat/tests/test_cloud_config.py | 1 - heat/tests/test_cloudwatch.py | 1 - heat/tests/test_cw_alarm.py | 1 - heat/tests/test_dbinstance.py | 1 - heat/tests/test_eip.py | 3 --- heat/tests/test_engine_api_utils.py | 1 - heat/tests/test_engine_service.py | 11 ----------- heat/tests/test_event.py | 1 - heat/tests/test_heat_autoscaling_group.py | 3 --- heat/tests/test_hot.py | 1 - heat/tests/test_instance.py | 1 - heat/tests/test_instance_group.py | 1 - .../tests/test_instance_group_update_policy.py | 1 - heat/tests/test_instance_network.py | 1 - heat/tests/test_iso8601_utils.py | 2 -- heat/tests/test_loadbalancer.py | 1 - heat/tests/test_metadata_refresh.py | 2 -- heat/tests/test_multi_part.py | 1 - heat/tests/test_nested_stack.py | 1 - heat/tests/test_neutron.py | 6 ------ heat/tests/test_neutron_autoscaling.py | 1 - heat/tests/test_neutron_firewall.py | 3 --- heat/tests/test_neutron_loadbalancer.py | 5 ----- heat/tests/test_neutron_metering.py | 2 -- heat/tests/test_neutron_network_gateway.py | 1 - heat/tests/test_neutron_security_group.py | 1 - heat/tests/test_neutron_vpnservice.py | 4 ---- heat/tests/test_nokey.py | 1 - heat/tests/test_notifications.py | 2 -- heat/tests/test_nova_floatingip.py | 2 -- heat/tests/test_nova_keypair.py | 1 - heat/tests/test_os_database.py | 1 - heat/tests/test_parser.py | 2 -- heat/tests/test_provider_template.py | 2 -- heat/tests/test_random_string.py | 1 - heat/tests/test_resource.py | 4 ---- heat/tests/test_resource_group.py | 1 - heat/tests/test_restarter.py | 1 - heat/tests/test_s3.py | 2 -- heat/tests/test_security_group.py | 1 - heat/tests/test_server.py | 1 - heat/tests/test_server_tags.py | 1 - heat/tests/test_signal.py | 2 -- heat/tests/test_software_config.py | 1 - heat/tests/test_software_deployment.py | 1 - heat/tests/test_sqlalchemy_api.py | 18 ------------------ heat/tests/test_stack_lock.py | 1 - heat/tests/test_stack_resource.py | 1 - heat/tests/test_stack_user.py | 2 -- heat/tests/test_structured_config.py | 2 -- heat/tests/test_swift.py | 2 -- heat/tests/test_template_format.py | 1 - heat/tests/test_user.py | 2 -- heat/tests/test_validate.py | 1 - heat/tests/test_volume.py | 1 - heat/tests/test_vpc.py | 1 - heat/tests/test_waitcondition.py | 12 ------------ heat/tests/test_watch.py | 8 +++----- 70 files changed, 6 insertions(+), 150 deletions(-) diff --git a/contrib/docker/docker/tests/test_docker_container.py b/contrib/docker/docker/tests/test_docker_container.py index 2ba021fdae..a0834e4afc 100644 --- a/contrib/docker/docker/tests/test_docker_container.py +++ b/contrib/docker/docker/tests/test_docker_container.py @@ -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) diff --git a/contrib/extraroute/extraroute/tests/test_extraroute.py b/contrib/extraroute/extraroute/tests/test_extraroute.py index 66f6898efe..4cff232490 100644 --- a/contrib/extraroute/extraroute/tests/test_extraroute.py +++ b/contrib/extraroute/extraroute/tests/test_extraroute.py @@ -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) diff --git a/contrib/marconi/marconi/tests/test_queue.py b/contrib/marconi/marconi/tests/test_queue.py index 1d41d65bd7..c9dbb97bdd 100644 --- a/contrib/marconi/marconi/tests/test_queue.py +++ b/contrib/marconi/marconi/tests/test_queue.py @@ -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) diff --git a/contrib/rackspace/rackspace/tests/test_auto_scale.py b/contrib/rackspace/rackspace/tests/test_auto_scale.py index efcdb15744..6c7b43ae43 100644 --- a/contrib/rackspace/rackspace/tests/test_auto_scale.py +++ b/contrib/rackspace/rackspace/tests/test_auto_scale.py @@ -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() diff --git a/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py b/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py index 1695a1fb0f..bd595eb1e9 100644 --- a/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py +++ b/contrib/rackspace/rackspace/tests/test_cloud_loadbalancer.py @@ -203,7 +203,6 @@ class LoadBalancerTest(HeatTestCase): } lb.resource_mapping = override_resource - utils.setup_dummy_db() resource._register_class("Rackspace::Cloud::LoadBalancer", LoadBalancerWithFakeClient) diff --git a/contrib/rackspace/rackspace/tests/test_cloudnetworks.py b/contrib/rackspace/rackspace/tests/test_cloudnetworks.py index b53b9abe1b..3972000a5e 100644 --- a/contrib/rackspace/rackspace/tests/test_cloudnetworks.py +++ b/contrib/rackspace/rackspace/tests/test_cloudnetworks.py @@ -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) diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py index 27f86f37bf..443a4f1030 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py @@ -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. diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_dns.py b/contrib/rackspace/rackspace/tests/test_rackspace_dns.py index 1c1856a307..6ce148551b 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_dns.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_dns.py @@ -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. diff --git a/heat/tests/common.py b/heat/tests/common.py index 0fade72d2a..a238510009 100644 --- a/heat/tests/common.py +++ b/heat/tests/common.py @@ -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): """ diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py index cde35e824e..c8f462f55e 100644 --- a/heat/tests/test_autoscaling.py +++ b/heat/tests/test_autoscaling.py @@ -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'}} diff --git a/heat/tests/test_autoscaling_update_policy.py b/heat/tests/test_autoscaling_update_policy.py index 536c9b7f87..c27cc76004 100644 --- a/heat/tests/test_autoscaling_update_policy.py +++ b/heat/tests/test_autoscaling_update_policy.py @@ -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') diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py index f80e036908..398e0c96bf 100644 --- a/heat/tests/test_ceilometer_alarm.py +++ b/heat/tests/test_ceilometer_alarm.py @@ -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( diff --git a/heat/tests/test_cloud_config.py b/heat/tests/test_cloud_config.py index 18fa6a21fa..75f12eda6f 100644 --- a/heat/tests/test_cloud_config.py +++ b/heat/tests/test_cloud_config.py @@ -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'} diff --git a/heat/tests/test_cloudwatch.py b/heat/tests/test_cloudwatch.py index fecfc1b391..ccbb190870 100644 --- a/heat/tests/test_cloudwatch.py +++ b/heat/tests/test_cloudwatch.py @@ -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): diff --git a/heat/tests/test_cw_alarm.py b/heat/tests/test_cw_alarm.py index e912bafc79..b5a867aff5 100644 --- a/heat/tests/test_cw_alarm.py +++ b/heat/tests/test_cw_alarm.py @@ -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, diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py index dd2d00ae3e..0ce7ee33a6 100644 --- a/heat/tests/test_dbinstance.py +++ b/heat/tests/test_dbinstance.py @@ -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 diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py index 68f7277975..38e7d446d0 100644 --- a/heat/tests/test_eip.py +++ b/heat/tests/test_eip.py @@ -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( diff --git a/heat/tests/test_engine_api_utils.py b/heat/tests/test_engine_api_utils.py index ed82541cc2..0a15da5683 100644 --- a/heat/tests/test_engine_api_utils.py +++ b/heat/tests/test_engine_api_utils.py @@ -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': { diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 9bc9b01730..791162796b 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -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, diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index 541617cdd9..91e3af6037 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -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() diff --git a/heat/tests/test_heat_autoscaling_group.py b/heat/tests/test_heat_autoscaling_group.py index 0b8fd546a2..50e24bb925 100644 --- a/heat/tests/test_heat_autoscaling_group.py +++ b/heat/tests/test_heat_autoscaling_group.py @@ -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() diff --git a/heat/tests/test_hot.py b/heat/tests/test_hot.py index 49f76d4343..66b799acc1 100644 --- a/heat/tests/test_hot.py +++ b/heat/tests/test_hot.py @@ -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', diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py index 62fa1bba99..860c3d1129 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -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) diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py index 45fa1b1e32..5a8e853b5f 100644 --- a/heat/tests/test_instance_group.py +++ b/heat/tests/test_instance_group.py @@ -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): """ diff --git a/heat/tests/test_instance_group_update_policy.py b/heat/tests/test_instance_group_update_policy.py index 01b049ef52..ae0bc79049 100644 --- a/heat/tests/test_instance_group_update_policy.py +++ b/heat/tests/test_instance_group_update_policy.py @@ -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') diff --git a/heat/tests/test_instance_network.py b/heat/tests/test_instance_network.py index 46a15bdc12..a7dc93f523 100644 --- a/heat/tests/test_instance_network.py +++ b/heat/tests/test_instance_network.py @@ -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 diff --git a/heat/tests/test_iso8601_utils.py b/heat/tests/test_iso8601_utils.py index cf4844f383..e3e0fbccf2 100644 --- a/heat/tests/test_iso8601_utils.py +++ b/heat/tests/test_iso8601_utils.py @@ -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')) diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index 65d64a7ae7..5e2c736a1d 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -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, diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py index 859b8bdb38..3c6bf88f96 100644 --- a/heat/tests/test_metadata_refresh.py +++ b/heat/tests/test_metadata_refresh.py @@ -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') diff --git a/heat/tests/test_multi_part.py b/heat/tests/test_multi_part.py index 840f627e4a..9e02ae676c 100644 --- a/heat/tests/test_multi_part.py +++ b/heat/tests/test_multi_part.py @@ -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() diff --git a/heat/tests/test_nested_stack.py b/heat/tests/test_nested_stack.py index 2667b82de0..dafe13599a 100644 --- a/heat/tests/test_nested_stack.py +++ b/heat/tests/test_nested_stack.py @@ -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) diff --git a/heat/tests/test_neutron.py b/heat/tests/test_neutron.py index b7b9ce8de3..48188070c9 100644 --- a/heat/tests/test_neutron.py +++ b/heat/tests/test_neutron.py @@ -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( diff --git a/heat/tests/test_neutron_autoscaling.py b/heat/tests/test_neutron_autoscaling.py index 5a50a71873..129fdcf2aa 100644 --- a/heat/tests/test_neutron_autoscaling.py +++ b/heat/tests/test_neutron_autoscaling.py @@ -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() diff --git a/heat/tests/test_neutron_firewall.py b/heat/tests/test_neutron_firewall.py index 4fa4b53a0b..5296febfe1 100644 --- a/heat/tests/test_neutron_firewall.py +++ b/heat/tests/test_neutron_firewall.py @@ -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( diff --git a/heat/tests/test_neutron_loadbalancer.py b/heat/tests/test_neutron_loadbalancer.py index 175151af85..a5d6c696e2 100644 --- a/heat/tests/test_neutron_loadbalancer.py +++ b/heat/tests/test_neutron_loadbalancer.py @@ -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( diff --git a/heat/tests/test_neutron_metering.py b/heat/tests/test_neutron_metering.py index 6247e907c0..95a8b69371 100644 --- a/heat/tests/test_neutron_metering.py +++ b/heat/tests/test_neutron_metering.py @@ -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( diff --git a/heat/tests/test_neutron_network_gateway.py b/heat/tests/test_neutron_network_gateway.py index 0ca3736ab8..fdd780091b 100644 --- a/heat/tests/test_neutron_network_gateway.py +++ b/heat/tests/test_neutron_network_gateway.py @@ -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( diff --git a/heat/tests/test_neutron_security_group.py b/heat/tests/test_neutron_security_group.py index cb854f7cad..04d51307bb 100644 --- a/heat/tests/test_neutron_security_group.py +++ b/heat/tests/test_neutron_security_group.py @@ -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') diff --git a/heat/tests/test_neutron_vpnservice.py b/heat/tests/test_neutron_vpnservice.py index dfde26f4ca..c8567f5c46 100644 --- a/heat/tests/test_neutron_vpnservice.py +++ b/heat/tests/test_neutron_vpnservice.py @@ -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( diff --git a/heat/tests/test_nokey.py b/heat/tests/test_nokey.py index 6b266e8711..416c14dad8 100644 --- a/heat/tests/test_nokey.py +++ b/heat/tests/test_nokey.py @@ -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): diff --git a/heat/tests/test_notifications.py b/heat/tests/test_notifications.py index 732f00e62a..705cd64982 100644 --- a/heat/tests/test_notifications.py +++ b/heat/tests/test_notifications.py @@ -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') diff --git a/heat/tests/test_nova_floatingip.py b/heat/tests/test_nova_floatingip.py index 2644416632..0930e4c75c 100644 --- a/heat/tests/test_nova_floatingip.py +++ b/heat/tests/test_nova_floatingip.py @@ -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(): diff --git a/heat/tests/test_nova_keypair.py b/heat/tests/test_nova_keypair.py index 9be009bae4..40ed5c1027 100644 --- a/heat/tests/test_nova_keypair.py +++ b/heat/tests/test_nova_keypair.py @@ -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 diff --git a/heat/tests/test_os_database.py b/heat/tests/test_os_database.py index 2fc7c9e7ef..6578ec01f5 100644 --- a/heat/tests/test_os_database.py +++ b/heat/tests/test_os_database.py @@ -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 diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py index 404b2afa56..de80952138 100644 --- a/heat/tests/test_parser.py +++ b/heat/tests/test_parser.py @@ -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', diff --git a/heat/tests/test_provider_template.py b/heat/tests/test_provider_template.py index 5d7b1a635e..4d38f23076 100644 --- a/heat/tests/test_provider_template.py +++ b/heat/tests/test_provider_template.py @@ -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): diff --git a/heat/tests/test_random_string.py b/heat/tests/test_random_string.py index ddb9653aea..27d26f331f 100644 --- a/heat/tests/test_random_string.py +++ b/heat/tests/test_random_string.py @@ -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): diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index 7b3ef6163e..66b7d2638e 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -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() diff --git a/heat/tests/test_resource_group.py b/heat/tests/test_resource_group.py index ad729d2760..254ae694fa 100644 --- a/heat/tests/test_resource_group.py +++ b/heat/tests/test_resource_group.py @@ -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): """ diff --git a/heat/tests/test_restarter.py b/heat/tests/test_restarter.py index c7a225a2ef..291d0bcd45 100644 --- a/heat/tests/test_restarter.py +++ b/heat/tests/test_restarter.py @@ -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) diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py index 8d54f749e9..5ba7c046d9 100644 --- a/heat/tests/test_s3.py +++ b/heat/tests/test_s3.py @@ -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], diff --git a/heat/tests/test_security_group.py b/heat/tests/test_security_group.py index bb2f7bf44d..575387e7b5 100644 --- a/heat/tests/test_security_group.py +++ b/heat/tests/test_security_group.py @@ -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') diff --git a/heat/tests/test_server.py b/heat/tests/test_server.py index 398bec3bf2..a4d1bd3c0b 100644 --- a/heat/tests/test_server.py +++ b/heat/tests/test_server.py @@ -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() diff --git a/heat/tests/test_server_tags.py b/heat/tests/test_server_tags.py index c7d49d6f23..ab75b4a7ee 100644 --- a/heat/tests/test_server_tags.py +++ b/heat/tests/test_server_tags.py @@ -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' diff --git a/heat/tests/test_signal.py b/heat/tests/test_signal.py index 728032d1a9..8b76daabbe 100644 --- a/heat/tests/test_signal.py +++ b/heat/tests/test_signal.py @@ -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 diff --git a/heat/tests/test_software_config.py b/heat/tests/test_software_config.py index 03a127c26b..e24956f915 100644 --- a/heat/tests/test_software_config.py +++ b/heat/tests/test_software_config.py @@ -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', diff --git a/heat/tests/test_software_deployment.py b/heat/tests/test_software_deployment.py index ec58aabe04..3636e7606a 100644 --- a/heat/tests/test_software_deployment.py +++ b/heat/tests/test_software_deployment.py @@ -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): diff --git a/heat/tests/test_sqlalchemy_api.py b/heat/tests/test_sqlalchemy_api.py index 15f749f9c8..3d04b0a44d 100644 --- a/heat/tests/test_sqlalchemy_api.py +++ b/heat/tests/test_sqlalchemy_api.py @@ -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) diff --git a/heat/tests/test_stack_lock.py b/heat/tests/test_stack_lock.py index 0145c3120d..8f4c74bfae 100644 --- a/heat/tests/test_stack_lock.py +++ b/heat/tests/test_stack_lock.py @@ -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" diff --git a/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py index 99b27f3f1f..24a485efdb 100644 --- a/heat/tests/test_stack_resource.py +++ b/heat/tests/test_stack_resource.py @@ -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', diff --git a/heat/tests/test_stack_user.py b/heat/tests/test_stack_user.py index bebba108fd..964b44d15d 100644 --- a/heat/tests/test_stack_user.py +++ b/heat/tests/test_stack_user.py @@ -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): diff --git a/heat/tests/test_structured_config.py b/heat/tests/test_structured_config.py index 49b67a2c17..5b3585ca41 100644 --- a/heat/tests/test_structured_config.py +++ b/heat/tests/test_structured_config.py @@ -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'}, diff --git a/heat/tests/test_swift.py b/heat/tests/test_swift.py index 3745456d02..2c8f5c38ab 100644 --- a/heat/tests/test_swift.py +++ b/heat/tests/test_swift.py @@ -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', diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py index ae05ca2fe2..0e977d62ee 100644 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@ -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__)), diff --git a/heat/tests/test_user.py b/heat/tests/test_user.py index 226ba8282f..cd2d4856f3 100644 --- a/heat/tests/test_user.py +++ b/heat/tests/test_user.py @@ -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, diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py index bde9fa864b..aecd437cfb 100644 --- a/heat/tests/test_validate.py +++ b/heat/tests/test_validate.py @@ -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): diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py index 802ae20dc4..3d6e8f813f 100644 --- a/heat/tests/test_volume.py +++ b/heat/tests/test_volume.py @@ -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] diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py index ec79be4057..c67694464f 100644 --- a/heat/tests/test_vpc.py +++ b/heat/tests/test_vpc.py @@ -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') diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py index 6d8cbd7231..050c4775db 100644 --- a/heat/tests/test_waitcondition.py +++ b/heat/tests/test_waitcondition.py @@ -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 diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py index b2363101b0..ad4ae62a84 100644 --- a/heat/tests/test_watch.py +++ b/heat/tests/test_watch.py @@ -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()