From db76bb9a8ff9fa927722eab66a74a13b256ad3f3 Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Thu, 16 Dec 2010 17:29:26 -0800
Subject: [PATCH] Fixed network test (thanks Vish!) and fixed run_tests.sh.

---
 bin/nova-dhcpbridge                                 |  1 -
 nova/tests/{network_unittest.py => test_network.py} |  0
 run_tests.sh                                        | 12 ++++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename nova/tests/{network_unittest.py => test_network.py} (100%)

diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 81b9b6dd3..828aba3d1 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -110,7 +110,6 @@ def main():
         FLAGS.num_networks = 5
         path = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                             '..',
-                                            '_trial_temp',
                                             'nova.sqlite'))
         FLAGS.sql_connection = 'sqlite:///%s' % path
     action = argv[1]
diff --git a/nova/tests/network_unittest.py b/nova/tests/test_network.py
similarity index 100%
rename from nova/tests/network_unittest.py
rename to nova/tests/test_network.py
diff --git a/run_tests.sh b/run_tests.sh
index a11dcd7cc..67214996d 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -36,7 +36,8 @@ done
 
 if [ $never_venv -eq 1 ]; then
   # Just run the test suites in current environment
-  python run_tests.py
+  rm -f nova.sqlite
+  nosetests -v
   exit
 fi
 
@@ -47,7 +48,8 @@ if [ $force -eq 1 ]; then
 fi
 
 if [ -e ${venv} ]; then
-  ${with_venv} python run_tests.py $@
+  ${with_venv} rm -f nova.sqlite
+  ${with_venv} nosetests -v $@
 else  
   if [ $always_venv -eq 1 ]; then
     # Automatically install the virtualenv
@@ -59,9 +61,11 @@ else
       # Install the virtualenv and run the test suite in it
       python tools/install_venv.py
     else
-      python run_tests.py
+      rm -f nova.sqlite
+      nosetests -v
       exit
     fi
   fi
-  ${with_venv} python run_tests.py $@
+  ${with_venv} rm -f nova.sqlite
+  ${with_venv} nosetests -v $@
 fi