get latest branch

1 files changed, 4 insertions, 2 deletions

diff --git a/run_tests.sh b/run_tests.sh
index 2ea221ae3..ddeb1dc4a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -6,7 +6,8 @@ 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 "  -r, --recreate-db        Recreate the test database (deprecated, as this is now the default)."
+  echo "  -n, --no-recreate-db     Don't 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"
@@ -25,6 +26,7 @@ function process_option {
     -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;;
+    -n|--no-recreate-db) let recreate_db=0;;
     -f|--force) let force=1;;
     -p|--pep8) let just_pep8=1;;
     -*) noseopts="$noseopts $1";;
@@ -41,7 +43,7 @@ noseargs=
 noseopts=
 wrapper=""
 just_pep8=0
-recreate_db=0
+recreate_db=1
 
 for arg in "$@"; do
   process_option $arg