Merge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetest

[mediagoblin.git] / mediagoblin / tests / test_privileges.py

diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py
index 9ae523f8e8f73706fb56dd6e24b969ffeb4932c8..05829b3497552b8aca304802391ab29db7cbb000 100644 (file)
--- 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):