Merge branch 'rodney757-media_plugins'

[mediagoblin.git] / mediagoblin / tests / test_paste.ini

diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini
index 929a1ccfdbebd543641063e55c9f3f2811a1036d..a95954325d7009cf11526fb8655613304f84bd58 100644 (file)
--- a/mediagoblin/tests/test_paste.ini
+++ b/mediagoblin/tests/test_paste.ini
@@ -5,12 +5,13 @@ debug = true
 use = egg:Paste#urlmap
 / = mediagoblin
 /mgoblin_media/ = publicstore_serve
-/mgoblin_static/ = mediagoblin_static
+/test_static/ = mediagoblin_static
+/theme_static/ = theme_static
+/plugin_static/ = plugin_static
 
 [app:mediagoblin]
 use = egg:mediagoblin#app
-filter-with = beaker
-config = %(here)s/test_mgoblin_app.ini
+config = %(here)s/mediagoblin.ini
 
 [app:publicstore_serve]
 use = egg:Paste#static
@@ -20,16 +21,18 @@ document_root = %(here)s/user_dev/media/public
 use = egg:Paste#static
 document_root = %(here)s/mediagoblin/static/
 
-[filter:beaker]
-use = egg:Beaker#beaker_session
-cache_dir = %(here)s/test_user_dev/beaker
-beaker.session.key = mediagoblin
-# beaker.session.secret = somesupersecret
-beaker.session.data_dir = %(here)s/test_user_dev/beaker/sessions/data
-beaker.session.lock_dir = %(here)s/test_user_dev/beaker/sessions/lock
+[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
+CELERY_ALWAYS_EAGER = true
 
 [server:main]
 use = egg:Paste#http