summaryrefslogtreecommitdiffstats
path: root/run_tests.sh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-22 22:55:38 +0000
committerGerrit Code Review <review@openstack.org>2013-04-22 22:55:38 +0000
commit92e40cee9d222b22e892ad1f1662020d8963315b (patch)
tree9983c2093064c6d2f92d6c71911b3a6b69085d11 /run_tests.sh
parent3c30012df63840d33e75ddf25b45d1221b2c949f (diff)
parent3f296e056cdbbee3636daceb7609efea0686b2d7 (diff)
downloadkeystone-92e40cee9d222b22e892ad1f1662020d8963315b.tar.gz
keystone-92e40cee9d222b22e892ad1f1662020d8963315b.tar.xz
keystone-92e40cee9d222b22e892ad1f1662020d8963315b.zip
Merge "don't migrate as often"
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 3218b787..22447c04 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -93,6 +93,14 @@ if [ $nokeystoneclient -eq 1 ]; then
noseopts="$noseopts -I test_keystoneclient*"
fi
+function cleanup_test_db {
+ # Default test settings will leave around some test*.db files
+ # TODO(termie): this could probably be moved into tests/__init__.py
+ # but there have been some issues with creating that
+ # file for some users
+ rm -f tests/test*.db
+}
+
function run_tests {
# Just run the test suites in current environment
${wrapper} $NOSETESTS
@@ -179,7 +187,7 @@ fi
if [ $recreate_db -eq 1 ]; then
- rm -f tests.sqlite
+ cleanup_test_db
fi
run_tests