fixed failing tests after rebase

mediagoblin/edit/views.py

@@ -342,7 +342,7 @@ def change_pass(request):
 
     if request.method == 'POST' and form.validate():
 
-        if not auth_lib.bcrypt_check_password(
+        if not auth.check_password(
                 form.old_password.data, user.pw_hash):
             form.old_password.errors.append(
                 _('Wrong password'))
@@ -354,7 +354,7 @@ def change_pass(request):
                  'user': user})
 
         # Password matches
-        user.pw_hash = auth_lib.bcrypt_gen_password_hash(
+        user.pw_hash = auth.gen_password_hash(
             form.new_password.data)
         user.save()
 

mediagoblin/tests/appconfig_static_plugin.ini

@@ -2,6 +2,7 @@
 direct_remote_path = /test_static/
 email_sender_address = "notice@mediagoblin.example.org"
 email_debug_mode = true
+no_auth = true
 
 # TODO: Switch to using an in-memory database
 sql_engine = "sqlite:///%(here)s/user_dev/mediagoblin.db"

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]]

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]
-

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]
-