From deb0f36f38c947d071f01c1f2cab8d8d40cd617f Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 21 Feb 2011 16:05:28 -0800
Subject: [PATCH] remove changes to test db

---
 bin/nova-dhcpbridge      | 2 +-
 nova/tests/fake_flags.py | 2 +-
 run_tests.py             | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index eda2dc07..35b837ca 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -113,7 +113,7 @@ def main():
         FLAGS.num_networks = 5
         path = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                             '..',
-                                            'tests.sqlite'))
+                                            'nova.sqlite'))
         FLAGS.sql_connection = 'sqlite:///%s' % path
     action = argv[1]
     if action in ['add', 'del', 'old']:
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 575fefff..cfa65c13 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -39,6 +39,6 @@ FLAGS.num_shelves = 2
 FLAGS.blades_per_shelf = 4
 FLAGS.iscsi_num_targets = 8
 FLAGS.verbose = True
-FLAGS.sql_connection = 'sqlite:///tests.sqlite'
+FLAGS.sql_connection = 'sqlite:///nova.sqlite'
 FLAGS.use_ipv6 = True
 FLAGS.logfile = 'tests.log'
diff --git a/run_tests.py b/run_tests.py
index 82345433..cb957da4 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -59,8 +59,6 @@ class NovaTestRunner(core.TextTestRunner):
 
 
 if __name__ == '__main__':
-    if os.path.exists("tests.sqlite"):
-        os.unlink("tests.sqlite")
     logging.setup()
     c = config.Config(stream=sys.stdout,
                       env=os.environ,