5 files changed, 25 insertions, 26 deletions
diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index 7a88281e..cf200791 100644
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -14,21 +14,9 @@
 # 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/>.
 
-import os
-import shutil
-
-from mediagoblin import mg_globals
-from mediagoblin.tests.tools import TEST_USER_DEV
-
 
 def setup_package():
 
     import warnings
     from sqlalchemy.exc import SAWarning
     warnings.simplefilter("error", SAWarning)
-
-
-def teardown_package():
-    # Remove and reinstall user_dev directories
-    if os.path.exists(TEST_USER_DEV):
-        shutil.rmtree(TEST_USER_DEV)
diff --git a/mediagoblin/tests/appconfig_context_modified.ini b/mediagoblin/tests/appconfig_context_modified.ini
index e93797df..80ca69b1 100644
--- a/mediagoblin/tests/appconfig_context_modified.ini
+++ b/mediagoblin/tests/appconfig_context_modified.ini
@@ -4,23 +4,23 @@ email_sender_address = "notice@mediagoblin.example.org"
 email_debug_mode = true
 
 # TODO: Switch to using an in-memory database
-sql_engine = "sqlite:///%(here)s/test_user_dev/mediagoblin.db"
+sql_engine = "sqlite:///%(here)s/user_dev/mediagoblin.db"
 
 # Celery shouldn't be set up by the application as it's setup via
 # mediagoblin.init.celery.from_celery
 celery_setup_elsewhere = true
 
 [storage:publicstore]
-base_dir = %(here)s/test_user_dev/media/public
+base_dir = %(here)s/user_dev/media/public
 base_url = /mgoblin_media/
 
 [storage:queuestore]
-base_dir = %(here)s/test_user_dev/media/queue
+base_dir = %(here)s/user_dev/media/queue
 
 [celery]
 CELERY_ALWAYS_EAGER = true
-CELERY_RESULT_DBURI = "sqlite:///%(here)s/test_user_dev/celery.db"
-BROKER_HOST = "sqlite:///%(here)s/test_user_dev/kombu.db"
+CELERY_RESULT_DBURI = "sqlite:///%(here)s/user_dev/celery.db"
+BROKER_HOST = "sqlite:///%(here)s/user_dev/kombu.db"
 
 [plugins]
 [[mediagoblin.tests.testplugins.modify_context]]
diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini
index 2e876812..0466b53b 100644
--- a/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@ -4,7 +4,7 @@ email_sender_address = "notice@mediagoblin.example.org"
 email_debug_mode = true
 
 # TODO: Switch to using an in-memory database
-sql_engine = "sqlite:///%(here)s/test_user_dev/mediagoblin.db"
+sql_engine = "sqlite:///%(here)s/user_dev/mediagoblin.db"
 
 # tag parsing
 tags_max_length = 50
@@ -15,16 +15,16 @@ allow_attachments = True
 media_types = mediagoblin.media_types.image, mediagoblin.media_types.pdf
 
 [storage:publicstore]
-base_dir = %(here)s/test_user_dev/media/public
+base_dir = %(here)s/user_dev/media/public
 base_url = /mgoblin_media/
 
 [storage:queuestore]
-base_dir = %(here)s/test_user_dev/media/queue
+base_dir = %(here)s/user_dev/media/queue
 
 [celery]
 CELERY_ALWAYS_EAGER = true
-CELERY_RESULT_DBURI = "sqlite:///%(here)s/test_user_dev/celery.db"
-BROKER_HOST = "sqlite:///%(here)s/test_user_dev/kombu.db"
+CELERY_RESULT_DBURI = "sqlite:///%(here)s/user_dev/celery.db"
+BROKER_HOST = "sqlite:///%(here)s/user_dev/kombu.db"
 
 [plugins]
 [[mediagoblin.plugins.api]]
diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini
index 91ecbb84..a9595432 100644
--- a/mediagoblin/tests/test_paste.ini
+++ b/mediagoblin/tests/test_paste.ini
@@ -6,6 +6,8 @@ use = egg:Paste#urlmap
 / = mediagoblin
 /mgoblin_media/ = publicstore_serve
 /test_static/ = mediagoblin_static
+/theme_static/ = theme_static
+/plugin_static/ = plugin_static
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
@@ -13,12 +15,22 @@ config = %(here)s/mediagoblin.ini
 
 [app:publicstore_serve]
 use = egg:Paste#static
-document_root = %(here)s/test_user_dev/media/public
+document_root = %(here)s/user_dev/media/public
 
 [app:mediagoblin_static]
 use = egg:Paste#static
 document_root = %(here)s/mediagoblin/static/
 
+[app:theme_static]
+use = egg:Paste#static
+document_root = %(here)s/user_dev/theme_static/
+cache_max_age = 86400
+
+[app:plugin_static]
+use = egg:Paste#static
+document_root = %(here)s/user_dev/plugin_static/
+cache_max_age = 86400
+
 [celery]
 CELERY_ALWAYS_EAGER = true
 
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 794ed940..2ee39e89 100644
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -40,8 +40,6 @@ TEST_SERVER_CONFIG = pkg_resources.resource_filename(
     'mediagoblin.tests', 'test_paste.ini')
 TEST_APP_CONFIG = pkg_resources.resource_filename(
     'mediagoblin.tests', 'test_mgoblin_app.ini')
-TEST_USER_DEV = pkg_resources.resource_filename(
-    'mediagoblin.tests', 'test_user_dev')
 
 
 USER_DEV_DIRECTORIES_TO_SETUP = ['media/public', 'media/queue']
@@ -103,7 +101,7 @@ def get_app(request, paste_config=None, mgoblin_config=None):
     # This is the directory we're copying the paste/mgoblin config stuff into
     run_dir = request.config._tmpdirhandler.mktemp(
         'mgoblin_app', numbered=True)
-    user_dev_dir = run_dir.mkdir('test_user_dev').strpath
+    user_dev_dir = run_dir.mkdir('user_dev').strpath
 
     new_paste_config = run_dir.join('paste.ini').strpath
     new_mgoblin_config = run_dir.join('mediagoblin.ini').strpath
@@ -232,3 +230,4 @@ def fixture_add_collection(name=u"My first Collection", user=None):
     Session.expunge(coll)
 
     return coll
+