From 2a8002d2c5fb5f95639516b2f5ecdae26c65c23d Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 9 Nov 2012 15:49:51 +0100 Subject: [PATCH] Use fixtures library for nova test fixtures. Moving the test-case setup and teardown code into managed fixtures so that we can better interact with them when we start running things in parallel. Part of blueprint grizzly-testtools Change-Id: I406be0a88b14c0dba2d22b4957e26a53442bbae3 --- bin/nova-dhcpbridge | 2 +- nova/tests/fake_flags.py | 49 ----------------------------------- nova/tests/test_imagecache.py | 2 +- nova/tests/xenapi/stubs.py | 2 +- 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 nova/tests/fake_flags.py diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 8ff2fac4..0e3d89e6 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -103,7 +103,7 @@ def main(): logging.setup("nova") if int(os.environ.get('TESTING', '0')): - from nova.tests import fake_flags + from nova.tests import conf_fixture action = argv[1] if action in ['add', 'del', 'old']: diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py deleted file mode 100644 index 83ec33ca..00000000 --- a/nova/tests/fake_flags.py +++ /dev/null @@ -1,49 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from nova.openstack.common import cfg - -CONF = cfg.CONF -CONF.import_opt('state_path', 'nova.config') -CONF.import_opt('scheduler_driver', 'nova.scheduler.manager') -CONF.import_opt('fake_network', 'nova.network.manager') -CONF.import_opt('network_size', 'nova.network.manager') -CONF.import_opt('num_networks', 'nova.network.manager') -CONF.import_opt('policy_file', 'nova.policy') -CONF.import_opt('compute_driver', 'nova.virt.driver') - - -def set_defaults(conf): - conf.set_default('api_paste_config', '$state_path/etc/nova/api-paste.ini') - conf.set_default('compute_driver', 'nova.virt.fake.FakeDriver') - conf.set_default('fake_network', True) - conf.set_default('fake_rabbit', True) - conf.set_default('flat_network_bridge', 'br100') - conf.set_default('network_size', 8) - conf.set_default('num_networks', 2) - conf.set_default('vlan_interface', 'eth0') - conf.set_default('rpc_backend', 'nova.openstack.common.rpc.impl_fake') - conf.set_default('sql_connection', "sqlite://") - conf.set_default('sqlite_synchronous', False) - conf.set_default('use_ipv6', True) - conf.set_default('verbose', True) - conf.set_default('rpc_response_timeout', 5) - conf.set_default('rpc_cast_timeout', 5) - conf.set_default('lock_path', None) - conf.set_default('floating_ip_dns_manager', 'nova.tests.utils.dns_manager') - conf.set_default('instance_dns_manager', 'nova.tests.utils.dns_manager') diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index 2a927b36..bfa948ce 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -763,7 +763,7 @@ class ImageCacheManagerTestCase(test.TestCase): def listdir(path): # The python coverage tool got angry with my overly broad mocks if not path.startswith('/instance_path'): - return orig_list(path) + return orig_listdir(path) if path == '/instance_path': return ['instance-1', 'instance-2', 'instance-3', '_base'] diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 560e12d7..ca828129 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -352,6 +352,6 @@ class XenAPITestBase(test.TestCase): def setUp(self): super(XenAPITestBase, self).setUp() - self.stub_module('XenAPI', fake) + self.useFixture(test.ReplaceModule('XenAPI', fake)) fake.reset()