diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-23 16:14:36 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-23 16:14:36 -0400 |
| commit | e46fb71c1d7067253f30cb7212c676b066a61432 (patch) | |
| tree | 3193ea6a271c20dda42a7c0faa16ae2e5942b450 /mediagoblin/tests/test_submission.py | |
| parent | 2c901db023cd29d8f12408470245c9a5b8b911f1 (diff) | |
| download | mediagoblin-e46fb71c1d7067253f30cb7212c676b066a61432.tar.lz mediagoblin-e46fb71c1d7067253f30cb7212c676b066a61432.tar.xz mediagoblin-e46fb71c1d7067253f30cb7212c676b066a61432.zip | |
pushing so paroneayea can help me resolve a conflict within the tests.
Diffstat (limited to 'mediagoblin/tests/test_submission.py')
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index dbdf87e9..ed088730 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -24,7 +24,7 @@ import pytest from mediagoblin.tests.tools import fixture_add_user from mediagoblin import mg_globals -from mediagoblin.db.models import MediaEntry +from mediagoblin.db.models import MediaEntry, User from mediagoblin.tools import template from mediagoblin.media_types.image import ImageMediaManager from mediagoblin.media_types.pdf.processing import check_prerequisites as pdf_check_prerequisites @@ -46,9 +46,9 @@ class TestSubmission: # TODO: Possibly abstract into a decorator like: # @as_authenticated_user('chris') - test_user = fixture_add_user(privileges=[u'active',u'uploader']) + fixture_add_user(privileges=[u'active',u'uploader']) - self.test_user = test_user + self.test_user = User.query.filter(User.username==u'chris').first() self.login() |