heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not fail is a user exists already

Browse Source 
When the tests want to create a new user, don't fail if it already
exists and just reuse the existing one. This allows us to run tests
without dumping the whole database if that is not needed for the tests.
The upcoming tests for test_edit will make use of this.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2013-01-08 10:22:13 +01:00
parent 7f4e42b0b1
commit a5cf95c5ad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mediagoblin/tests/tools.py
View File

@ -25,6 +25,7 @@ from paste.deploy import loadapp
from webtest import TestApp
from mediagoblin import mg_globals
from mediagoblin.db.models import User
from mediagoblin.tools import testing
from mediagoblin.init.config import read_mediagoblin_config
from mediagoblin.db.open import setup_connection_and_db_from_config
@ -202,9 +203,9 @@ def assert_db_meets_expected(db, expected):
assert document == expected_document # make sure it matches
def fixture_add_user(username=u'chris', password='toast',
def fixture_add_user(username=u'chris', password=u'toast',
active_user=True):
test_user = mg_globals.database.User()
test_user = User.query.filter_by(username=username).first() or User()
test_user.username = username
test_user.email = username + u'@example.com'
if password is not None:
@ -216,7 +217,7 @@ def fixture_add_user(username=u'chris', password='toast',
test_user.save()
# Reload
test_user = mg_globals.database.User.find_one({'username': username})
test_user = User.query.filter_by(username=username).first()
# ... and detach from session:
Session.expunge(test_user)