diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-21 16:07:45 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-21 16:07:45 -0800 |
| commit | fa56b624c65c577215aff4454f965ede7641d57a (patch) | |
| tree | 5583db5c3635eaf40aab6336deaa426249f364ab | |
| parent | 90007cd9085909a1e1ac59732a0b371dd79c2557 (diff) | |
| parent | 71f7119910f16cb99c10f43a07ccb1e7c0ca473f (diff) | |
| download | nova-fa56b624c65c577215aff4454f965ede7641d57a.tar.gz nova-fa56b624c65c577215aff4454f965ede7641d57a.tar.xz nova-fa56b624c65c577215aff4454f965ede7641d57a.zip | |
merged fix
| -rw-r--r-- | nova/tests/fake_flags.py | 2 | ||||
| -rwxr-xr-x | run_tests.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py index 575fefff6..cfa65c137 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.sh b/run_tests.sh index 4e21fe945..70212cc6a 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -40,7 +40,7 @@ done function run_tests { # Just run the test suites in current environment ${wrapper} rm -f nova.sqlite - ${wrapper} $NOSETESTS 2> run_tests.err.log + ${wrapper} $NOSETESTS } NOSETESTS="python run_tests.py $noseargs" |