projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added post_entry at /api/submit
[mediagoblin.git]
/
mediagoblin
/
tests
/
__init__.py
diff --git
a/mediagoblin/tests/__init__.py
b/mediagoblin/tests/__init__.py
index 8aec4a96767637d2063b41ec5473398e05da6c3d..4e84914ae76bf6d1ffa702c1419e3be60253c3b8 100644
(file)
--- a/
mediagoblin/tests/__init__.py
+++ b/
mediagoblin/tests/__init__.py
@@
-1,5
+1,5
@@
# GNU MediaGoblin -- federated, autonomous media hosting
# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011
Free Software Foundation, Inc
+# Copyright (C) 2011
, 2012 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
#
# 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
@@
-14,17
+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/>.
# 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 mediagoblin import mg_globals
+import os
+import shutil
-from mediagoblin.tests.tools import MEDIAGOBLIN_TEST_DB_NAME
+from mediagoblin import mg_globals
+from mediagoblin.tests.tools import (
+ TEST_USER_DEV, 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
- and mg_globals.database.name == MEDIAGOBLIN_TEST_DB_NAME)):
- print "Killing db ..."
- mg_globals.db_connection.drop_database(MEDIAGOBLIN_TEST_DB_NAME)
- print "... done"
+ # Remove and reinstall user_dev directories
+ if os.path.exists(TEST_USER_DEV):
+ shutil.rmtree(TEST_USER_DEV)