Permalink
Browse files

only create the db if it doesn't exist, add an option -r to run_tests…

….py to delete it
  • Loading branch information...
1 parent 8a8c013 commit 9978d656d262a95e17a60a2c137664b315f8191a @vishvananda vishvananda committed Jun 26, 2011
Showing with 11 additions and 5 deletions.
  1. +1 −1 nova/tests/__init__.py
  2. +3 −4 run_tests.py
  3. +7 −0 run_tests.sh
View
@@ -50,7 +50,7 @@ def setup():
testdb = os.path.join(FLAGS.state_path, FLAGS.sqlite_db)
if os.path.exists(testdb):
- os.unlink(testdb)
+ return
migration.db_sync()
ctxt = context.get_admin_context()
network_manager.VlanManager().create_networks(ctxt,
View
@@ -69,7 +69,6 @@
from nose import result
from nova import log as logging
-from nova.tests import fake_flags
class _AnsiColorizer(object):
@@ -211,11 +210,11 @@ def __init__(self, *args, **kw):
break
sys.stdout = stdout
- # NOTE(lorinh): Initialize start_time in case a sqlalchemy-migrate
- # error results in it failing to be initialized later. Otherwise,
+ # NOTE(lorinh): Initialize start_time in case a sqlalchemy-migrate
+ # error results in it failing to be initialized later. Otherwise,
# _handleElapsedTime will fail, causing the wrong error message to
# be outputted.
- self.start_time = time.time()
+ self.start_time = time.time()
def getDescription(self, test):
return str(test)
View
@@ -6,6 +6,7 @@ function usage {
echo ""
echo " -V, --virtual-env Always use virtualenv. Install automatically if not present"
echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment"
+ echo " -r, --recreate-db Recreate the test database."
echo " -x, --stop Stop running tests after the first error or failure."
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
echo " -p, --pep8 Just run pep8"
@@ -23,6 +24,7 @@ function process_option {
-h|--help) usage;;
-V|--virtual-env) let always_venv=1; let never_venv=0;;
-N|--no-virtual-env) let always_venv=0; let never_venv=1;;
+ -r|--recreate-db) let recreate_db=1;;
-f|--force) let force=1;;
-p|--pep8) let just_pep8=1;;
-*) noseopts="$noseopts $1";;
@@ -39,6 +41,7 @@ noseargs=
noseopts=
wrapper=""
just_pep8=0
+recreate_db=0
for arg in "$@"; do
process_option $arg
@@ -108,6 +111,10 @@ if [ $just_pep8 -eq 1 ]; then
exit
fi
+if [ $recreate_db -eq 1 ]; then
+ rm tests.sqlite
+fi
+
run_tests || exit
# NOTE(sirp): we only want to run pep8 when we're running the full-test suite,

0 comments on commit 9978d65

Please sign in to comment.