diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-04 19:44:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-04-04 19:44:36 -0500 |
| commit | fe6755f0f44e1148e2cb72538f8e64c4a9740f7f (patch) | |
| tree | c241564789e8c4b11440b248af548de6b5a7c286 /mediagoblin/tests/test_auth.py | |
| parent | 39a71c09d7fbc991d8045341facb2bef8c838b5b (diff) | |
| parent | 5c2ece7401723486d76ea0fcd2f99ba4d1002504 (diff) | |
| download | mediagoblin-fe6755f0f44e1148e2cb72538f8e64c4a9740f7f.tar.lz mediagoblin-fe6755f0f44e1148e2cb72538f8e64c4a9740f7f.tar.xz mediagoblin-fe6755f0f44e1148e2cb72538f8e64c4a9740f7f.zip | |
Merge branch '614_multi_test_config'
Diffstat (limited to 'mediagoblin/tests/test_auth.py')
| -rw-r--r-- | mediagoblin/tests/test_auth.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index a59a319c..f9fe8ed1 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, get_app, fixture_add_user +from mediagoblin.tests.tools import fixture_add_user from mediagoblin.tools import template, mail @@ -65,7 +65,6 @@ def test_bcrypt_gen_password_hash(): 'notthepassword', hashed_pw, '3><7R45417') -@setup_fresh_app def test_register_views(test_app): """ Massive test function that all our registration-related views all work. @@ -300,11 +299,10 @@ def test_register_views(test_app): assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT -def test_authentication_views(): +def test_authentication_views(test_app): """ Test logging in and logging out """ - test_app = get_app(dump_old_app=False) # Make a new user test_user = fixture_add_user(active_user=False) |