diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-23 14:10:11 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-23 14:10:11 -0400 |
| commit | a523ffce3c84832f95b1376c5a3719fc9ba8cb77 (patch) | |
| tree | 6a6d4374dccc99ccffbc86fcedae316adc30ae28 /mediagoblin/tests | |
| parent | 6483b37060062ef7c7d40d9ae712c99a7e73775a (diff) | |
| download | mediagoblin-a523ffce3c84832f95b1376c5a3719fc9ba8cb77.tar.lz mediagoblin-a523ffce3c84832f95b1376c5a3719fc9ba8cb77.tar.xz mediagoblin-a523ffce3c84832f95b1376c5a3719fc9ba8cb77.zip | |
This commit was solely to remove unused imports in the code that I have written
Diffstat (limited to 'mediagoblin/tests')
| -rw-r--r-- | mediagoblin/tests/test_api.py | 1 | ||||
| -rw-r--r-- | mediagoblin/tests/test_moderation.py | 3 | ||||
| -rw-r--r-- | mediagoblin/tests/test_privileges.py | 7 | ||||
| -rw-r--r-- | mediagoblin/tests/test_submission.py | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py index eb9c0fd4..4e0cbd8f 100644 --- a/mediagoblin/tests/test_api.py +++ b/mediagoblin/tests/test_api.py @@ -25,7 +25,6 @@ from mediagoblin.tools import template, pluginapi from mediagoblin.tests.tools import fixture_add_user from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \ BIG_BLUE -from mediagoblin.db.models import Privilege _log = logging.getLogger(__name__) diff --git a/mediagoblin/tests/test_moderation.py b/mediagoblin/tests/test_moderation.py index 8de76e44..e7a0ebef 100644 --- a/mediagoblin/tests/test_moderation.py +++ b/mediagoblin/tests/test_moderation.py @@ -19,10 +19,7 @@ import pytest from mediagoblin.tests.tools import (fixture_add_user, fixture_add_comment_report, fixture_add_comment) from mediagoblin.db.models import User, CommentReport, MediaComment, UserBan -from mediagoblin.moderation.tools import take_away_privileges, give_privileges from mediagoblin.tools import template, mail -from datetime import date, timedelta - from webtest import AppError class TestModerationViews: diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py index 9ae523f8..05829b34 100644 --- a/mediagoblin/tests/test_privileges.py +++ b/mediagoblin/tests/test_privileges.py @@ -20,8 +20,7 @@ from webtest import AppError from mediagoblin.tests.tools import fixture_add_user, fixture_media_entry -from mediagoblin.db.models import User, Privilege, UserBan -from mediagoblin.db.base import Session +from mediagoblin.db.models import User, UserBan from mediagoblin.tools import template from .resources import GOOD_JPG @@ -34,7 +33,7 @@ class TestPrivilegeFunctionality: fixture_add_user(u'alex', privileges=[u'admin',u'active']) - fixture_add_user(u'raven', + fixture_add_user(u'meow', privileges=[u'moderator',u'active',u'reporter']) fixture_add_user(u'natalie', privileges=[u'active']) @@ -65,7 +64,7 @@ class TestPrivilegeFunctionality: def query_for_users(self): self.admin_user = User.query.filter(User.username==u'alex').first() - self.mod_user = User.query.filter(User.username==u'raven').first() + self.mod_user = User.query.filter(User.username==u'meow').first() self.user = User.query.filter(User.username==u'natalie').first() def testUserBanned(self): diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index d8cb9827..14766c50 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, User, Privilege +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 |