test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a couple of test-ordering-dependant failures introduced in [11639] that caused test failures when running the whole test suite. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2009-10-24 00:23:47 +00:00
parent 0d1177ae99
commit 9f70783b14
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/regressiontests/comment_tests/tests/moderation_view_tests.py
View File

@ -168,9 +168,12 @@ class AdminActionsTests(CommentTestCase):
# Make "normaluser" a moderator # Make "normaluser" a moderator
u = User.objects.get(username="normaluser") u = User.objects.get(username="normaluser")
u.is_staff = True u.is_staff = True
u.user_permissions.add(Permission.objects.get(codename='add_comment')) perms = Permission.objects.filter(
u.user_permissions.add(Permission.objects.get(codename='change_comment')) content_type__app_label = 'comments',
u.user_permissions.add(Permission.objects.get(codename='delete_comment')) codename__endswith = 'comment'
)
for perm in perms:
u.user_permissions.add(perm)
u.save() u.save()
def testActionsNonModerator(self): def testActionsNonModerator(self):

9
tests/regressiontests/comment_tests/urls_admin.py
View File

@ -1,8 +1,13 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
from django.contrib import admin from django.contrib import admin
from django.contrib.comments.admin import CommentsAdmin
from django.contrib.comments.models import Comment
admin.autodiscover() # Make a new AdminSite to avoid picking up the deliberately broken admin
# modules in other tests.
admin_site = admin.AdminSite()
admin_site.register(Comment, CommentsAdmin)
urlpatterns = patterns('', urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)), (r'^admin/', include(admin_site.urls)),
) )