diff options
| author | Eric Day <eday@oddments.org> | 2010-12-16 17:29:26 -0800 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-12-16 17:29:26 -0800 |
| commit | b1d4579404f9e49fcdea23c21733fdf65edc1da3 (patch) | |
| tree | b1b8410d013557c381895caf6d71e06edbb5f0a5 | |
| parent | 8c343e1b4b92aa7b1062acebe8eaea402bc6ab4a (diff) | |
| download | nova-b1d4579404f9e49fcdea23c21733fdf65edc1da3.tar.gz nova-b1d4579404f9e49fcdea23c21733fdf65edc1da3.tar.xz nova-b1d4579404f9e49fcdea23c21733fdf65edc1da3.zip | |
Fixed network test (thanks Vish!) and fixed run_tests.sh.
| -rwxr-xr-x | bin/nova-dhcpbridge | 1 | ||||
| -rw-r--r-- | nova/tests/test_network.py (renamed from nova/tests/network_unittest.py) | 0 | ||||
| -rwxr-xr-x | run_tests.sh | 12 |
3 files changed, 8 insertions, 5 deletions
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 index bcac20585..bcac20585 100644 --- a/nova/tests/network_unittest.py +++ b/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 |