Merge remote branch 'remotes/gullydwarf-cfdv/437_slug_shouldnt_be_empty'

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

diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index 46c7fd69eca7c48b9f105992f60ce7f25cec05a4..adb6a1b3ab041d85751703c0c896211cb14ec2dd 100644 (file)
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -14,13 +14,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .. import globals
+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 ..."
-    globals.db_connection.drop_database(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"