Make tests start with a clean database for every test.

bin/nova-dhcpbridge

@@ -105,18 +105,7 @@ def main():
     logging.setup()
     interface = os.environ.get('DNSMASQ_INTERFACE', 'br0')
     if int(os.environ.get('TESTING', '0')):
-        FLAGS.fake_rabbit = True
-        FLAGS.network_size = 16
-        FLAGS.connection_type = 'fake'
-        FLAGS.fake_network = True
-        FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
-        FLAGS.num_networks = 5
-        path = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                            '..',
-                                            'nova',
-                                            'tests',
-                                            'tests.sqlite'))
-        FLAGS.sql_connection = 'sqlite:///%s' % path
+        from nova.tests import fake_flags
     action = argv[1]
     if action in ['add', 'del', 'old']:
         mac = argv[2]

nova/flags.py

@@ -324,8 +324,9 @@ DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'),
 DEFINE_string('logdir', None, 'output to a per-service log file in named '
                               'directory')
 
+DEFINE_string('sqlite_db', 'nova.sqlite', 'file name for sqlite')
 DEFINE_string('sql_connection',
-              'sqlite:///$state_path/nova.sqlite',
+              'sqlite:///$state_path/$sqlite_db',
               'connection string for sql database')
 DEFINE_integer('sql_idle_timeout',
               3600,

nova/tests/fake_flags.py

@@ -29,8 +29,8 @@ FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
 flags.DECLARE('network_size', 'nova.network.manager')
 flags.DECLARE('num_networks', 'nova.network.manager')
 flags.DECLARE('fake_network', 'nova.network.manager')
-FLAGS.network_size = 16
-FLAGS.num_networks = 5
+FLAGS.network_size = 8
+FLAGS.num_networks = 2
 FLAGS.fake_network = True
 flags.DECLARE('num_shelves', 'nova.volume.driver')
 flags.DECLARE('blades_per_shelf', 'nova.volume.driver')
@@ -39,5 +39,5 @@ FLAGS.num_shelves = 2
 FLAGS.blades_per_shelf = 4
 FLAGS.iscsi_num_targets = 8
 FLAGS.verbose = True
-FLAGS.sql_connection = 'sqlite:///tests.sqlite'
+FLAGS.sqlite_db = "tests.sqlite"
 FLAGS.use_ipv6 = True

nova/tests/objectstore_unittest.py

@@ -311,4 +311,5 @@ class S3APITestCase(test.TestCase):
         self.auth_manager.delete_user('admin')
         self.auth_manager.delete_project('admin')
         stop_listening = defer.maybeDeferred(self.listening_port.stopListening)
+        super(S3APITestCase, self).tearDown()
         return defer.DeferredList([stop_listening])

nova/tests/test_direct.py

@@ -52,6 +52,7 @@ class DirectTestCase(test.TestCase):
 
     def tearDown(self):
         direct.ROUTES = {}
+        super(DirectTestCase, self).tearDown()
 
     def test_delegated_auth(self):
         req = webob.Request.blank('/fake/context')

nova/tests/test_network.py

@@ -42,15 +42,13 @@ class NetworkTestCase(test.TestCase):
         #             flags in the corresponding section in nova-dhcpbridge
         self.flags(connection_type='fake',
                    fake_call=True,
-                   fake_network=True,
-                   network_size=16,
-                   num_networks=5)
+                   fake_network=True)
         self.manager = manager.AuthManager()
         self.user = self.manager.create_user('netuser', 'netuser', 'netuser')
         self.projects = []
         self.network = utils.import_object(FLAGS.network_manager)
         self.context = context.RequestContext(project=None, user=self.user)
-        for i in range(5):
+        for i in range(FLAGS.num_networks):
             name = 'project%s' % i
             project = self.manager.create_project(name, 'netuser', name)
             self.projects.append(project)
@@ -195,7 +193,7 @@ class NetworkTestCase(test.TestCase):
         first = self._create_address(0)
         lease_ip(first)
         instance_ids = []
-        for i in range(1, 5):
+        for i in range(1, FLAGS.num_networks):
             instance_ref = self._create_instance(i, mac=utils.generate_mac())
             instance_ids.append(instance_ref['id'])
             address = self._create_address(i, instance_ref['id'])

nova/tests/test_virt.py

@@ -207,9 +207,9 @@ class LibvirtConnTestCase(test.TestCase):
         db.instance_destroy(user_context, instance_ref['id'])
 
     def tearDown(self):
-        super(LibvirtConnTestCase, self).tearDown()
         self.manager.delete_project(self.project)
         self.manager.delete_user(self.user)
+        super(LibvirtConnTestCase, self).tearDown()
 
 
 class IptablesFirewallTestCase(test.TestCase):
@@ -390,6 +390,7 @@ class NWFilterTestCase(test.TestCase):
     def tearDown(self):
         self.manager.delete_project(self.project)
         self.manager.delete_user(self.user)
+        super(NWFilterTestCase, self).tearDown()
 
     def test_cidr_rule_nwfilter_xml(self):
         cloud_controller = cloud.CloudController()

run_tests.py

@@ -61,8 +61,8 @@ import unittest
 import sys
 
 from nose import config
-from nose import result
 from nose import core
+from nose import result
 
 from nova import log as logging
 from nova.tests import fake_flags
@@ -280,10 +280,6 @@ class NovaTestRunner(core.TextTestRunner):
 
 if __name__ == '__main__':
     logging.setup()
-    testdir = os.path.abspath(os.path.join("nova", "tests"))
-    testdb = os.path.join(testdir, "tests.sqlite")
-    if os.path.exists(testdb):
-        os.unlink(testdb)
     # If any argument looks like a test name but doesn't have "nova.tests" in
     # front of it, automatically add that so we don't have to type as much
     argv = []
@@ -293,6 +289,7 @@ if __name__ == '__main__':
         else:
             argv.append(x)
 
+    testdir = os.path.abspath(os.path.join("nova", "tests"))
     c = config.Config(stream=sys.stdout,
                       env=os.environ,
                       verbosity=3,