diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-24 16:53:22 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-24 16:53:22 -0800 |
| commit | e7ed4e198e5fc2c9f33080c323b8d8c2872e8659 (patch) | |
| tree | 7c5465ac746d1765be25c236d33fdd0dc20fe915 /run_tests.py | |
| parent | 6cd8097642647d34e1f1f9c96a035a1efd96b754 (diff) | |
| parent | 9c1f1c72883bb58a1d0de8541e55078859c2315c (diff) | |
| download | nova-e7ed4e198e5fc2c9f33080c323b8d8c2872e8659.tar.gz nova-e7ed4e198e5fc2c9f33080c323b8d8c2872e8659.tar.xz nova-e7ed4e198e5fc2c9f33080c323b8d8c2872e8659.zip | |
merge clean db
Diffstat (limited to 'run_tests.py')
| -rw-r--r-- | run_tests.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/run_tests.py b/run_tests.py index 8025548e5..3c8d410e1 100644 --- a/run_tests.py +++ b/run_tests.py @@ -61,8 +61,8 @@ import unittest import sys from nose import config -from nose import result from nose import core +from nose import result from nova import log as logging from nova.tests import fake_flags @@ -280,10 +280,6 @@ class NovaTestRunner(core.TextTestRunner): 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 = [] @@ -293,6 +289,7 @@ if __name__ == '__main__': else: argv.append(x) + testdir = os.path.abspath(os.path.join("nova", "tests")) c = config.Config(stream=sys.stdout, env=os.environ, verbosity=3, |