Merge lp:~vishvananda/nova/tests-clean-db into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Make tests start with a clean database for every test.

I got tired of cascading test failures, so I made tests snapshot the db after fixtures have been created. This should fix virtually all the cascading failures that we saw previously. Note that I changed all of the os api tests to inherit from our base test case and to call super.setUp and tearDown.

The snapshot is really fast, so it doesn't really affect the running time of the tests. In fact it may even be faster.

[Vish Ishaya (vishvananda)]

Tests run in < 80 seconds on my dev box, which is much faster.

[Josh Kearney (jk0)]

This is great -- tests now run at around ~70s for me. I also like the pretty colors.

review: Approve

[Jay Pipes (jaypipes)]

Changing all test cases to inherit from test.TestCase is not useful, IMHO. Many of the test cases have no need to touch the database nor do they need to go through all the code in test.TestCase.setUp and tearDown, which is why Gundlach and I changed many of them to inherit from unittest.TestCase if they had no need of the base test class methods.

The tests would run even faster than 80 seconds if they didn't all change to inherit from a base class they don't need to inherit from. This is why Gundlach and I spent so much time changing loads of test cases to inherit from unittest.TestCase in the first place.

I'd prefer we change the name of test.TestCase to something like test.FullEnvironmentTestCase or something like that...

[Vish Ishaya (vishvananda)]

Jay: I think all of our tests should inherit from the same base class and cleanup in between. That way if someone forgets to leak items into the db (as was happening in some of the openstack api tests), it still gets cleaned properly for the next test.

Now that the set up happens in fixtures, the time difference between the two is negligible. In fact they seem to be virtually the same speed, changing slightly based on system load:

[UNITEST VERSION]
vishvananda@i-uswrlzxk:~/tests-clean-db$ time for i in `seq 1 5`; do python run_tests.py nova.tests.api.openstack.test_servers > /dev/null; done

real 0m16.181s
user 0m5.600s
sys 0m0.590s

[TEST VERSION]
vishvananda@i-uswrlzxk:~/tests-clean-db$ vi nova/tests/api/openstack/test_servers.py
vishvananda@i-uswrlzxk:~/tests-clean-db$ time for i in `seq 1 5`; do python run_tests.py nova.tests.api.openstack.test_servers > /dev/null; done

real 0m15.740s
user 0m5.350s
sys 0m0.780s

I understand why you went the unittest route before (setup of test.TestCase was SLOW!!!) but I don't think there is any reason for it now.

Vish

[Todd Willey (xtoddx)]

review: Approve

=== modified file 'bin/nova-dhcpbridge'
--- bin/nova-dhcpbridge	2011-02-23 23:39:43 +0000
+++ bin/nova-dhcpbridge	2011-02-23 23:39:43 +0000
@@ -105,18 +105,7 @@
     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]

=== modified file 'nova/flags.py'
--- nova/flags.py	2011-02-21 21:59:46 +0000
+++ nova/flags.py	2011-02-23 23:39:43 +0000
@@ -285,8 +285,9 @@
 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,

=== modified file 'nova/test.py'
--- nova/test.py	2011-02-22 09:59:53 +0000
+++ nova/test.py	2011-02-23 23:39:43 +0000
@@ -22,26 +22,28 @@
 and some black magic for inline callbacks.
 """
 
+
 import datetime
+import os
+import shutil
 import uuid
 import unittest
 
 import mox
+import shutil
 import stubout
 
 from nova import context
 from nova import db
 from nova import fakerabbit
 from nova import flags
-from nova import log as logging
 from nova import rpc
 from nova import service
-from nova.network import manager as network_manager
 
 
 FLAGS = flags.FLAGS
-flags.DEFINE_bool('flush_db', True,
-                  'Flush the database before running fake tests')
+flags.DEFINE_string('sqlite_clean_db', 'clean.sqlite',
+                    'File name of clean sqlite db')
 flags.DEFINE_bool('fake_tests', True,
                   'should we use everything for testing')
 
@@ -66,15 +68,8 @@
         #             now that we have some required db setup for the system
         #             to work properly.
         self.start = datetime.datetime.utcnow()
-        ctxt = context.get_admin_context()
-        if db.network_count(ctxt) != 5:
-            network_manager.VlanManager().create_networks(ctxt,
-                                                          FLAGS.fixed_range,
-                                                          5, 16,
-                                                          FLAGS.fixed_range_v6,
-                                                          FLAGS.vlan_start,
-                                                          FLAGS.vpn_start,
-                                                          )
+        shutil.copyfile(os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db),
+                        os.path.join(FLAGS.state_path, FLAGS.sqlite_db))
 
         # emulate some of the mox stuff, we can't use the metaclass
         # because it screws with our generators
@@ -96,17 +91,6 @@
             self.mox.VerifyAll()
             super(TestCase, self).tearDown()
         finally:
-            try:
-                # Clean up any ips associated during the test.
-                ctxt = context.get_admin_context()
-                db.fixed_ip_disassociate_all_by_timeout(ctxt, FLAGS.host,
-                                                        self.start)
-                db.network_disassociate_all(ctxt)
-
-                db.security_group_destroy_all(ctxt)
-            except Exception:
-                pass
-
             # Clean out fake_rabbit's queue if we used it
             if FLAGS.fake_rabbit:
                 fakerabbit.reset_all()

=== modified file 'nova/tests/__init__.py'
--- nova/tests/__init__.py	2011-01-19 01:32:54 +0000
+++ nova/tests/__init__.py	2011-02-23 23:39:43 +0000
@@ -37,5 +37,30 @@
 
 
 def setup():
+    import os
+    import shutil
+
+    from nova import context
+    from nova import flags
     from nova.db import migration
+    from nova.network import manager as network_manager
+    from nova.tests import fake_flags
+
+    FLAGS = flags.FLAGS
+
+    testdb = os.path.join(FLAGS.state_path, FLAGS.sqlite_db)
+    if os.path.exists(testdb):
+        os.unlink(testdb)
     migration.db_sync()
+    ctxt = context.get_admin_context()
+    network_manager.VlanManager().create_networks(ctxt,
+                                                  FLAGS.fixed_range,
+                                                  FLAGS.num_networks,
+                                                  FLAGS.network_size,
+                                                  FLAGS.fixed_range_v6,
+                                                  FLAGS.vlan_start,
+                                                  FLAGS.vpn_start,
+                                                  )
+
+    cleandb = os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db)
+    shutil.copyfile(testdb, cleandb)

=== modified file 'nova/tests/api/openstack/__init__.py'
--- nova/tests/api/openstack/__init__.py	2011-02-09 18:30:40 +0000
+++ nova/tests/api/openstack/__init__.py	2011-02-23 23:39:43 +0000
@@ -16,7 +16,7 @@
 #    under the License.
 
 import webob.dec
-import unittest
+from nova import test
 
 from nova import context
 from nova import flags
@@ -33,7 +33,7 @@
     return ""
 
 
-class RateLimitingMiddlewareTest(unittest.TestCase):
+class RateLimitingMiddlewareTest(test.TestCase):
 
     def test_get_action_name(self):
         middleware = RateLimitingMiddleware(simple_wsgi)

=== modified file 'nova/tests/api/openstack/test_adminapi.py'
--- nova/tests/api/openstack/test_adminapi.py	2011-01-06 07:08:01 +0000
+++ nova/tests/api/openstack/test_adminapi.py	2011-02-23 23:39:43 +0000
@@ -15,13 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import unittest
 
 import stubout
 import webob
 from paste import urlmap
 
 from nova import flags
+from nova import test
 from nova.api import openstack
 from nova.api.openstack import ratelimiting
 from nova.api.openstack import auth
@@ -30,9 +30,10 @@
 FLAGS = flags.FLAGS
 
 
-class AdminAPITest(unittest.TestCase):
+class AdminAPITest(test.TestCase):
 
     def setUp(self):
+        super(AdminAPITest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         fakes.FakeAuthManager.auth_data = {}
         fakes.FakeAuthDatabase.data = {}
@@ -44,6 +45,7 @@
     def tearDown(self):
         self.stubs.UnsetAll()
         FLAGS.allow_admin_api = self.allow_admin
+        super(AdminAPITest, self).tearDown()
 
     def test_admin_enabled(self):
         FLAGS.allow_admin_api = True
@@ -58,8 +60,5 @@
         # We should still be able to access public operations.
         req = webob.Request.blank('/v1.0/flavors')
         res = req.get_response(fakes.wsgi_app())
-        self.assertEqual(res.status_int, 200)
         # TODO: Confirm admin operations are unavailable.
-
-if __name__ == '__main__':
-    unittest.main()
+        self.assertEqual(res.status_int, 200)

=== modified file 'nova/tests/api/openstack/test_api.py'
--- nova/tests/api/openstack/test_api.py	2011-01-06 19:22:11 +0000
+++ nova/tests/api/openstack/test_api.py	2011-02-23 23:39:43 +0000
@@ -15,17 +15,17 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import unittest
 import webob.exc
 import webob.dec
 
 from webob import Request
 
+from nova import test
 from nova.api import openstack
 from nova.api.openstack import faults
 
 
-class APITest(unittest.TestCase):
+class APITest(test.TestCase):
 
     def _wsgi_app(self, inner_app):
         # simpler version of the app than fakes.wsgi_app

=== modified file 'nova/tests/api/openstack/test_auth.py'
--- nova/tests/api/openstack/test_auth.py	2011-02-19 07:33:06 +0000
+++ nova/tests/api/openstack/test_auth.py	2011-02-23 23:39:43 +0000
@@ -16,7 +16,6 @@
 #    under the License.
 
 import datetime
-import unittest
 
 import stubout
 import webob
@@ -27,12 +26,14 @@
 import nova.auth.manager
 from nova import auth
 from nova import context
+from nova import test
 from nova.tests.api.openstack import fakes
 
 
-class Test(unittest.TestCase):
+class Test(test.TestCase):
 
     def setUp(self):
+        super(Test, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         self.stubs.Set(nova.api.openstack.auth.AuthMiddleware,
             '__init__', fakes.fake_auth_init)
@@ -45,6 +46,7 @@
     def tearDown(self):
         self.stubs.UnsetAll()
         fakes.fake_data_store = {}
+        super(Test, self).tearDown()
 
     def test_authorize_user(self):
         f = fakes.FakeAuthManager()
@@ -128,8 +130,9 @@
         self.assertEqual(result.status, '401 Unauthorized')
 
 
-class TestLimiter(unittest.TestCase):
+class TestLimiter(test.TestCase):
     def setUp(self):
+        super(TestLimiter, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         self.stubs.Set(nova.api.openstack.auth.AuthMiddleware,
             '__init__', fakes.fake_auth_init)
@@ -141,6 +144,7 @@
     def tearDown(self):
         self.stubs.UnsetAll()
         fakes.fake_data_store = {}
+        super(TestLimiter, self).tearDown()
 
     def test_authorize_token(self):
         f = fakes.FakeAuthManager()
@@ -161,7 +165,3 @@
         result = req.get_response(fakes.wsgi_app())
         self.assertEqual(result.status, '200 OK')
         self.assertEqual(result.headers['X-Test-Success'], 'True')
-
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'nova/tests/api/openstack/test_common.py'
--- nova/tests/api/openstack/test_common.py	2011-02-09 18:30:40 +0000
+++ nova/tests/api/openstack/test_common.py	2011-02-23 23:39:43 +0000
@@ -19,14 +19,14 @@
 Test suites for 'common' code used throughout the OpenStack HTTP API.
 """
 
-import unittest
 
 from webob import Request
 
+from nova import test
 from nova.api.openstack.common import limited
 
 
-class LimiterTest(unittest.TestCase):
+class LimiterTest(test.TestCase):
     """
     Unit tests for the `nova.api.openstack.common.limited` method which takes
     in a list of items and, depending on the 'offset' and 'limit' GET params,
@@ -37,6 +37,7 @@
         """
         Run before each test.
         """
+        super(LimiterTest, self).setUp()
         self.tiny = range(1)
         self.small = range(10)
         self.medium = range(1000)

=== modified file 'nova/tests/api/openstack/test_faults.py'
--- nova/tests/api/openstack/test_faults.py	2010-10-22 07:48:27 +0000
+++ nova/tests/api/openstack/test_faults.py	2011-02-23 23:39:43 +0000
@@ -15,15 +15,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import unittest
 import webob
 import webob.dec
 import webob.exc
 
+from nova import test
 from nova.api.openstack import faults
 
 
-class TestFaults(unittest.TestCase):
+class TestFaults(test.TestCase):
 
     def test_fault_parts(self):
         req = webob.Request.blank('/.xml')

=== modified file 'nova/tests/api/openstack/test_flavors.py'
--- nova/tests/api/openstack/test_flavors.py	2011-01-06 07:08:01 +0000
+++ nova/tests/api/openstack/test_flavors.py	2011-02-23 23:39:43 +0000
@@ -15,18 +15,18 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import unittest
-
 import stubout
 import webob
 
+from nova import test
 import nova.api
 from nova.api.openstack import flavors
 from nova.tests.api.openstack import fakes
 
 
-class FlavorsTest(unittest.TestCase):
+class FlavorsTest(test.TestCase):
     def setUp(self):
+        super(FlavorsTest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         fakes.FakeAuthManager.auth_data = {}
         fakes.FakeAuthDatabase.data = {}
@@ -36,6 +36,7 @@
 
     def tearDown(self):
         self.stubs.UnsetAll()
+        super(FlavorsTest, self).tearDown()
 
     def test_get_flavor_list(self):
         req = webob.Request.blank('/v1.0/flavors')
@@ -43,6 +44,3 @@
 
     def test_get_flavor_by_id(self):
         pass
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'nova/tests/api/openstack/test_images.py'
--- nova/tests/api/openstack/test_images.py	2011-01-26 01:22:16 +0000
+++ nova/tests/api/openstack/test_images.py	2011-02-23 23:39:43 +0000
@@ -22,7 +22,6 @@
 
 import json
 import datetime
-import unittest
 
 import stubout
 import webob
@@ -30,6 +29,7 @@
 from nova import context
 from nova import exception
 from nova import flags
+from nova import test
 from nova import utils
 import nova.api.openstack
 from nova.api.openstack import images
@@ -130,12 +130,13 @@
         self.assertEquals(1, num_images)
 
 
-class LocalImageServiceTest(unittest.TestCase,
+class LocalImageServiceTest(test.TestCase,
                             BaseImageServiceTests):
 
     """Tests the local image service"""
 
     def setUp(self):
+        super(LocalImageServiceTest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         service_class = 'nova.image.local.LocalImageService'
         self.service = utils.import_object(service_class)
@@ -145,14 +146,16 @@
         self.service.delete_all()
         self.service.delete_imagedir()
         self.stubs.UnsetAll()
-
-
-class GlanceImageServiceTest(unittest.TestCase,
+        super(LocalImageServiceTest, self).tearDown()
+
+
+class GlanceImageServiceTest(test.TestCase,
                              BaseImageServiceTests):
 
     """Tests the local image service"""
 
     def setUp(self):
+        super(GlanceImageServiceTest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         fakes.stub_out_glance(self.stubs)
         fakes.stub_out_compute_api_snapshot(self.stubs)
@@ -163,9 +166,10 @@
 
     def tearDown(self):
         self.stubs.UnsetAll()
-
-
-class ImageControllerWithGlanceServiceTest(unittest.TestCase):
+        super(GlanceImageServiceTest, self).tearDown()
+
+
+class ImageControllerWithGlanceServiceTest(test.TestCase):
 
     """Test of the OpenStack API /images application controller"""
 
@@ -194,6 +198,7 @@
          'image_type': 'ramdisk'}]
 
     def setUp(self):
+        super(ImageControllerWithGlanceServiceTest, self).setUp()
         self.orig_image_service = FLAGS.image_service
         FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self.stubs = stubout.StubOutForTesting()
@@ -208,6 +213,7 @@
     def tearDown(self):
         self.stubs.UnsetAll()
         FLAGS.image_service = self.orig_image_service
+        super(ImageControllerWithGlanceServiceTest, self).tearDown()
 
     def test_get_image_index(self):
         req = webob.Request.blank('/v1.0/images')

=== modified file 'nova/tests/api/openstack/test_ratelimiting.py'
--- nova/tests/api/openstack/test_ratelimiting.py	2010-10-22 07:48:27 +0000
+++ nova/tests/api/openstack/test_ratelimiting.py	2011-02-23 23:39:43 +0000
@@ -1,15 +1,16 @@
 import httplib
 import StringIO
 import time
-import unittest
 import webob
 
+from nova import test
 import nova.api.openstack.ratelimiting as ratelimiting
 
 
-class LimiterTest(unittest.TestCase):
+class LimiterTest(test.TestCase):
 
     def setUp(self):
+        super(LimiterTest, self).setUp()
         self.limits = {
                 'a': (5, ratelimiting.PER_SECOND),
                 'b': (5, ratelimiting.PER_MINUTE),
@@ -83,9 +84,10 @@
         return self._delay
 
 
-class WSGIAppTest(unittest.TestCase):
+class WSGIAppTest(test.TestCase):
 
     def setUp(self):
+        super(WSGIAppTest, self).setUp()
         self.limiter = FakeLimiter(self)
         self.app = ratelimiting.WSGIApp(self.limiter)
 
@@ -206,7 +208,7 @@
     httplib.HTTPConnection = HTTPConnectionDecorator(httplib.HTTPConnection)
 
 
-class WSGIAppProxyTest(unittest.TestCase):
+class WSGIAppProxyTest(test.TestCase):
 
     def setUp(self):
         """Our WSGIAppProxy is going to call across an HTTPConnection to a
@@ -218,6 +220,7 @@
         at the WSGIApp.  And the limiter isn't real -- it's a fake that
         behaves the way we tell it to.
         """
+        super(WSGIAppProxyTest, self).setUp()
         self.limiter = FakeLimiter(self)
         app = ratelimiting.WSGIApp(self.limiter)
         wire_HTTPConnection_to_WSGI('100.100.100.100:80', app)
@@ -238,7 +241,3 @@
             self.limiter.mock('murder', 'brutus', None)
             self.proxy.perform('stab', 'brutus')
         self.assertRaises(AssertionError, shouldRaise)
-
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'nova/tests/api/openstack/test_servers.py'
--- nova/tests/api/openstack/test_servers.py	2011-02-23 18:11:35 +0000
+++ nova/tests/api/openstack/test_servers.py	2011-02-23 23:39:43 +0000
@@ -17,13 +17,13 @@
 
 import datetime
 import json
-import unittest
 
 import stubout
 import webob
 
 from nova import db
 from nova import flags
+from nova import test
 import nova.api.openstack
 from nova.api.openstack import servers
 import nova.db.api
@@ -113,9 +113,10 @@
     return True
 
 
-class ServersTest(unittest.TestCase):
+class ServersTest(test.TestCase):
 
     def setUp(self):
+        super(ServersTest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         fakes.FakeAuthManager.auth_data = {}
         fakes.FakeAuthDatabase.data = {}
@@ -146,6 +147,7 @@
     def tearDown(self):
         self.stubs.UnsetAll()
         FLAGS.allow_admin_api = self.allow_admin
+        super(ServersTest, self).tearDown()
 
     def test_get_server_by_id(self):
         req = webob.Request.blank('/v1.0/servers/1')
@@ -417,7 +419,3 @@
         res = req.get_response(fakes.wsgi_app())
         self.assertEqual(res.status, '202 Accepted')
         self.assertEqual(self.server_delete_called, True)
-
-
-if __name__ == "__main__":
-    unittest.main()

=== modified file 'nova/tests/api/openstack/test_shared_ip_groups.py'
--- nova/tests/api/openstack/test_shared_ip_groups.py	2011-01-06 08:55:16 +0000
+++ nova/tests/api/openstack/test_shared_ip_groups.py	2011-02-23 23:39:43 +0000
@@ -15,19 +15,20 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import unittest
-
 import stubout
 
+from nova import test
 from nova.api.openstack import shared_ip_groups
 
 
-class SharedIpGroupsTest(unittest.TestCase):
+class SharedIpGroupsTest(test.TestCase):
     def setUp(self):
+        super(SharedIpGroupsTest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
 
     def tearDown(self):
         self.stubs.UnsetAll()
+        super(SharedIpGroupsTest, self).tearDown()
 
     def test_get_shared_ip_groups(self):
         pass

=== modified file 'nova/tests/api/openstack/test_zones.py'
--- nova/tests/api/openstack/test_zones.py	2011-02-19 09:51:13 +0000
+++ nova/tests/api/openstack/test_zones.py	2011-02-23 23:39:43 +0000
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import unittest
 
 import stubout
 import webob
@@ -22,6 +21,7 @@
 import nova.db
 from nova import context
 from nova import flags
+from nova import test
 from nova.api.openstack import zones
 from nova.tests.api.openstack import fakes
 
@@ -60,8 +60,9 @@
                  password='qwerty')]
 
 
-class ZonesTest(unittest.TestCase):
+class ZonesTest(test.TestCase):
     def setUp(self):
+        super(ZonesTest, self).setUp()
         self.stubs = stubout.StubOutForTesting()
         fakes.FakeAuthManager.auth_data = {}
         fakes.FakeAuthDatabase.data = {}
@@ -81,6 +82,7 @@
     def tearDown(self):
         self.stubs.UnsetAll()
         FLAGS.allow_admin_api = self.allow_admin
+        super(ZonesTest, self).tearDown()
 
     def test_get_zone_list(self):
         req = webob.Request.blank('/v1.0/zones')
@@ -134,7 +136,3 @@
         self.assertEqual(res_dict['zone']['id'], 1)
         self.assertEqual(res_dict['zone']['api_url'], 'http://foo.com')
         self.assertFalse('username' in res_dict['zone'])
-
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'nova/tests/api/test_wsgi.py'
--- nova/tests/api/test_wsgi.py	2010-10-25 16:25:50 +0000
+++ nova/tests/api/test_wsgi.py	2011-02-23 23:39:43 +0000
@@ -21,7 +21,7 @@
 Test WSGI basics and provide some helper functions for other WSGI tests.
 """
 
-import unittest
+from nova import test
 
 import routes
 import webob
@@ -29,7 +29,7 @@
 from nova import wsgi
 
 
-class Test(unittest.TestCase):
+class Test(test.TestCase):
 
     def test_debug(self):
 
@@ -92,7 +92,7 @@
         self.assertNotEqual(result.body, "123")
 
 
-class SerializerTest(unittest.TestCase):
+class SerializerTest(test.TestCase):
 
     def match(self, url, accept, expect):
         input_dict = dict(servers=dict(a=(2, 3)))

=== modified file 'nova/tests/fake_flags.py'
--- nova/tests/fake_flags.py	2011-02-23 23:39:43 +0000
+++ nova/tests/fake_flags.py	2011-02-23 23:39:43 +0000
@@ -29,8 +29,8 @@
 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.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

=== modified file 'nova/tests/objectstore_unittest.py'
--- nova/tests/objectstore_unittest.py	2011-01-04 05:23:35 +0000
+++ nova/tests/objectstore_unittest.py	2011-02-23 23:39:43 +0000
@@ -311,4 +311,5 @@
         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])

=== modified file 'nova/tests/test_direct.py'
--- nova/tests/test_direct.py	2011-02-21 07:16:10 +0000
+++ nova/tests/test_direct.py	2011-02-23 23:39:43 +0000
@@ -52,6 +52,7 @@
 
     def tearDown(self):
         direct.ROUTES = {}
+        super(DirectTestCase, self).tearDown()
 
     def test_delegated_auth(self):
         req = webob.Request.blank('/fake/context')

=== modified file 'nova/tests/test_network.py'
--- nova/tests/test_network.py	2011-02-23 07:21:01 +0000
+++ nova/tests/test_network.py	2011-02-23 23:39:43 +0000
@@ -42,15 +42,13 @@
         #             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 @@
         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'])

=== modified file 'nova/tests/test_virt.py'
--- nova/tests/test_virt.py	2011-02-23 07:21:01 +0000
+++ nova/tests/test_virt.py	2011-02-23 23:39:43 +0000
@@ -207,9 +207,9 @@
         db.instance_destroy(user_context, instance_ref['id'])
 
     def tearDown(self):
+        self.manager.delete_project(self.project)
+        self.manager.delete_user(self.user)
         super(LibvirtConnTestCase, self).tearDown()
-        self.manager.delete_project(self.project)
-        self.manager.delete_user(self.user)
 
 
 class IptablesFirewallTestCase(test.TestCase):
@@ -390,6 +390,7 @@
     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()

=== modified file 'run_tests.py'
--- run_tests.py	2011-02-23 23:39:43 +0000
+++ run_tests.py	2011-02-23 23:39:43 +0000
@@ -61,8 +61,8 @@
 import sys
 
 from nose import config
+from nose import core
 from nose import result
-from nose import core
 
 from nova import log as logging
 from nova.tests import fake_flags
@@ -277,10 +277,6 @@
 
 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 = []
@@ -290,6 +286,7 @@
         else:
             argv.append(x)
 
+    testdir = os.path.abspath(os.path.join("nova", "tests"))
     c = config.Config(stream=sys.stdout,
                       env=os.environ,
                       verbosity=3,