aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/auth_configs
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-05-23 13:55:11 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-05-24 16:52:50 -0700
commit9008e09941ee7621fc375edb485120a54abd6ad1 (patch)
tree5a330a2b8e8b9d6250e7ddd62ae0bcb072557a87 /mediagoblin/tests/auth_configs
parentb194f29fe3f295b2426fb0ef4809fee6e74c17e7 (diff)
downloadmediagoblin-9008e09941ee7621fc375edb485120a54abd6ad1.tar.lz
mediagoblin-9008e09941ee7621fc375edb485120a54abd6ad1.tar.xz
mediagoblin-9008e09941ee7621fc375edb485120a54abd6ad1.zip
fixed failing tests after rebase
Diffstat (limited to 'mediagoblin/tests/auth_configs')
-rw-r--r--mediagoblin/tests/auth_configs/basic_auth_appconfig.ini10
-rw-r--r--mediagoblin/tests/auth_configs/no_auth_false_no_auth_plugin_appconfig.ini11
-rw-r--r--mediagoblin/tests/auth_configs/no_auth_true_no_auth_plugin_appconfig.ini11
3 files changed, 15 insertions, 17 deletions
diff --git a/mediagoblin/tests/auth_configs/basic_auth_appconfig.ini b/mediagoblin/tests/auth_configs/basic_auth_appconfig.ini
index b15ae1fb..b8c246f4 100644
--- a/mediagoblin/tests/auth_configs/basic_auth_appconfig.ini
+++ b/mediagoblin/tests/auth_configs/basic_auth_appconfig.ini
@@ -5,23 +5,23 @@ email_debug_mode = true
no_auth = false
# 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.plugins.basic_auth]]
diff --git a/mediagoblin/tests/auth_configs/no_auth_false_no_auth_plugin_appconfig.ini b/mediagoblin/tests/auth_configs/no_auth_false_no_auth_plugin_appconfig.ini
index 719ff260..49f9e9de 100644
--- a/mediagoblin/tests/auth_configs/no_auth_false_no_auth_plugin_appconfig.ini
+++ b/mediagoblin/tests/auth_configs/no_auth_false_no_auth_plugin_appconfig.ini
@@ -5,23 +5,22 @@ email_debug_mode = true
no_auth = false
# 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]
-
diff --git a/mediagoblin/tests/auth_configs/no_auth_true_no_auth_plugin_appconfig.ini b/mediagoblin/tests/auth_configs/no_auth_true_no_auth_plugin_appconfig.ini
index 6c0d5241..5e6cfde6 100644
--- a/mediagoblin/tests/auth_configs/no_auth_true_no_auth_plugin_appconfig.ini
+++ b/mediagoblin/tests/auth_configs/no_auth_true_no_auth_plugin_appconfig.ini
@@ -5,23 +5,22 @@ email_debug_mode = true
no_auth = 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]
-