Fixes after merging video into master - part 2

[mediagoblin.git] / mediagoblin / tests / __init__.py

diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index e9e2a59ae9caacd0a4e7534e9b9d2605142bfad7..eac3dff4dcb32f5bb2274bfa4b51a19157f0a19c 100644 (file)
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,11 +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():
-    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"