diff options
| author | Chris Moylan <chris@chrismoylan.com> | 2011-06-22 21:40:17 -0500 |
|---|---|---|
| committer | Chris Moylan <chris@chrismoylan.com> | 2011-06-22 21:40:17 -0500 |
| commit | dcebe4b032453b31db93e0796c84de7dc8bdb005 (patch) | |
| tree | 7608cd77fafd6ffb6179e8d7bd1c50bfcd9cdfb5 /mediagoblin/tests/__init__.py | |
| parent | 1975b5dd1fdae5ddb2819b8c67a29f9c374fce40 (diff) | |
| parent | 54de443a6a6cd673cfef0efa73a9d5e6fc6cde7c (diff) | |
| download | mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.tar.lz mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.tar.xz mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.zip | |
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/tests/__init__.py')
| -rw-r--r-- | mediagoblin/tests/__init__.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py index 1f1e23e9..adb6a1b3 100644 --- a/mediagoblin/tests/__init__.py +++ b/mediagoblin/tests/__init__.py @@ -16,12 +16,17 @@ from mediagoblin import mg_globals +from mediagoblin.tests.tools import ( + MEDIAGOBLIN_TEST_DB_NAME, suicide_if_bad_celery_environ) + def setup_package(): - pass + suicide_if_bad_celery_environ() + 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" |