mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed #14123 -- Made AdminDocs tests optional, based on the availability of docutils. Thanks to PaulM for the original report, and Łukasz Rekucki for narrowing down the cause.

Browse Source 
Backport of r13606 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-08-19 13:12:52 +00:00
parent 5588870529
commit c9016c15a9
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/regressiontests/admin_views/tests.py
View File

@ -2171,6 +2171,10 @@ class UserAdminTest(TestCase):
self.assertEquals(User.objects.count(), user_count + 1)
self.assertNotEquals(new_user.password, UNUSABLE_PASSWORD)
try:
# If docutils isn't installed, skip the AdminDocs tests.
import docutils
class AdminDocsTest(TestCase):
fixtures = ['admin-views-users.xml']
@ -2207,3 +2211,6 @@ class AdminDocsTest(TestCase):
# A builtin filter exists in both the index and detail
self.assertContains(response, '<h3 id="add">add</h3>')
self.assertContains(response, '<li><a href="#add">add</a></li>')
except ImportError:
pass