projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'remotes/elrond/dev/storage_config'
[mediagoblin.git]
/
mediagoblin
/
tests
/
__init__.py
diff --git
a/mediagoblin/tests/__init__.py
b/mediagoblin/tests/__init__.py
index 1f1e23e9c3af6a0360e2ff1b7407be5dbb71cfff..adb6a1b3ab041d85751703c0c896211cb14ec2dd 100644
(file)
--- a/
mediagoblin/tests/__init__.py
+++ b/
mediagoblin/tests/__init__.py
@@
-16,12
+16,17
@@
from mediagoblin import mg_globals
from mediagoblin import mg_globals
+from mediagoblin.tests.tools import (
+ MEDIAGOBLIN_TEST_DB_NAME, suicide_if_bad_celery_environ)
+
def setup_package():
def setup_package():
- pass
+ suicide_if_bad_celery_environ()
+
def teardown_package():
def teardown_package():
- if mg_globals.db_connection:
- print "Killing db ..."
- mg_globals.db_connection.drop_database(mg_globals.database.name)
- print "... done"
+ if ((mg_globals.db_connection
+ and mg_globals.database.name == MEDIAGOBLIN_TEST_DB_NAME)):
+ print "Killing db ..."
+ mg_globals.db_connection.drop_database(MEDIAGOBLIN_TEST_DB_NAME)
+ print "... done"