aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_auth.py
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2013-01-08 16:57:15 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2013-01-08 16:57:15 +0100
commit031d988c29c5466e4334d4f5bb6c402e2fb2f53b (patch)
tree292af1bea1d452005e97858e9ca6861e19931998 /mediagoblin/tests/test_auth.py
parent5018a3557cb4bff707966bddf8c086a6ed10f53b (diff)
parentb97144dcc970750b265b8e9605f9a4da0cee50e4 (diff)
downloadmediagoblin-031d988c29c5466e4334d4f5bb6c402e2fb2f53b.tar.lz
mediagoblin-031d988c29c5466e4334d4f5bb6c402e2fb2f53b.tar.xz
mediagoblin-031d988c29c5466e4334d4f5bb6c402e2fb2f53b.zip
Merge branch 'WIP/test_performance'
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
-rw-r--r--mediagoblin/tests/test_auth.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index f4a31a81..a40c9cbc 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -22,7 +22,7 @@ from nose.tools import assert_equal
from mediagoblin import mg_globals
from mediagoblin.auth import lib as auth_lib
from mediagoblin.db.models import User
-from mediagoblin.tests.tools import setup_fresh_app, fixture_add_user
+from mediagoblin.tests.tools import get_test_app, fixture_add_user
from mediagoblin.tools import template, mail
@@ -67,11 +67,11 @@ def test_bcrypt_gen_password_hash():
'notthepassword', hashed_pw, '3><7R45417')
-@setup_fresh_app
-def test_register_views(test_app):
+def test_register_views():
"""
Massive test function that all our registration-related views all work.
"""
+ test_app = get_test_app(dump_old_app=False)
# Test doing a simple GET on the page
# -----------------------------------
@@ -311,11 +311,11 @@ def test_register_views(test_app):
'mediagoblin/root.html')
-@setup_fresh_app
-def test_authentication_views(test_app):
+def test_authentication_views():
"""
Test logging in and logging out
"""
+ test_app = get_test_app(dump_old_app=False)
# Make a new user
test_user = fixture_add_user(active_user=False)