diff options
author | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-15 15:56:05 -0700 |
---|---|---|
committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-24 16:52:48 -0700 |
commit | fa7232913c42fe242e07060f0f42ff546f6d68cc (patch) | |
tree | bb605840559c7e0c0f341f5583af5e5158b12286 /mediagoblin/tests/tools.py | |
parent | f65615eaf9bd01786ae91c21103b7b3ef921896f (diff) | |
download | mediagoblin-fa7232913c42fe242e07060f0f42ff546f6d68cc.tar.lz mediagoblin-fa7232913c42fe242e07060f0f42ff546f6d68cc.tar.xz mediagoblin-fa7232913c42fe242e07060f0f42ff546f6d68cc.zip |
modified test .ini files and changed tests to use basic_auth bcrypt
Diffstat (limited to 'mediagoblin/tests/tools.py')
-rw-r--r-- | mediagoblin/tests/tools.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 2ee39e89..35c2c3e9 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -31,7 +31,7 @@ from mediagoblin.tools import testing from mediagoblin.init.config import read_mediagoblin_config from mediagoblin.db.base import Session from mediagoblin.meddleware import BaseMeddleware -from mediagoblin.auth.lib import bcrypt_gen_password_hash +from mediagoblin.auth import gen_password_hash from mediagoblin.gmg_commands.dbupdate import run_dbupdate @@ -179,7 +179,7 @@ def fixture_add_user(username=u'chris', password=u'toast', test_user.username = username test_user.email = username + u'@example.com' if password is not None: - test_user.pw_hash = bcrypt_gen_password_hash(password) + test_user.pw_hash = gen_password_hash(password) if active_user: test_user.email_verified = True test_user.status = u'active' |