aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/__init__.py
diff options
context:
space:
mode:
authorcfdv <caldavis@gmail.com>2011-06-19 17:39:32 -0500
committercfdv <caldavis@gmail.com>2011-06-19 17:39:32 -0500
commit0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada (patch)
tree7a0936a9a83f9f39a090f96e41a274ac77ddaee4 /mediagoblin/tests/__init__.py
parente8fda91bc2326911ea9a0197e595bc333540c282 (diff)
parent188240e312b8c5ff50bef276c97b36e5b3835f1e (diff)
downloadmediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.lz
mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.xz
mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.zip
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
Diffstat (limited to 'mediagoblin/tests/__init__.py')
-rw-r--r--mediagoblin/tests/__init__.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index e9e2a59a..1f1e23e9 100644
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -21,6 +21,7 @@ def setup_package():
pass
def teardown_package():
- print "Killing db ..."
- mg_globals.db_connection.drop_database(mg_globals.database.name)
- print "... done"
+ if mg_globals.db_connection:
+ print "Killing db ..."
+ mg_globals.db_connection.drop_database(mg_globals.database.name)
+ print "... done"