summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-04-24 07:08:52 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-04-24 07:08:52 +0000
commitd2fec79d7bbe6eae337107969b836a1a0b14b89b (patch)
treebf3edc498965da4edd8cc1843ba0c75b9602b804 /tests
parentd9a0fd48ba1a4ac04c917099785d35700bef6ccc (diff)
downloaddjango-d2fec79d7bbe6eae337107969b836a1a0b14b89b.tar.gz
Fixed #13362 -- Disabled the test for bug #8245 under Python 2.3 due to differences in exception handling.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13021 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/bug8245/tests.py41
1 files changed, 22 insertions, 19 deletions
diff --git a/tests/regressiontests/bug8245/tests.py b/tests/regressiontests/bug8245/tests.py
index b7c7bcdf7c..dd194b9536 100644
--- a/tests/regressiontests/bug8245/tests.py
+++ b/tests/regressiontests/bug8245/tests.py
@@ -1,3 +1,4 @@
+import sys
from unittest import TestCase
from django.contrib import admin
@@ -8,23 +9,25 @@ class Bug8245Test(TestCase):
Test for bug #8245 - don't raise an AlreadyRegistered exception when using
autodiscover() and an admin.py module contains an error.
"""
+ if sys.version_info[1] >= 4:
+ # Due to a bug in Python 2.3, this test will fail. The actual
+ # feature works fine; it's just a testing problem. See #13362 for details.
+ def test_bug_8245(self):
+ # The first time autodiscover is called, we should get our real error.
+ try:
+ admin.autodiscover()
+ except Exception, e:
+ self.failUnlessEqual(str(e), "Bad admin module")
+ else:
+ self.fail(
+ 'autodiscover should have raised a "Bad admin module" error.')
- def test_bug_8245(self):
- # The first time autodiscover is called, we should get our real error.
- try:
- admin.autodiscover()
- except Exception, e:
- self.failUnlessEqual(str(e), "Bad admin module")
- else:
- self.fail(
- 'autodiscover should have raised a "Bad admin module" error.')
-
- # Calling autodiscover again should raise the very same error it did
- # the first time, not an AlreadyRegistered error.
- try:
- admin.autodiscover()
- except Exception, e:
- self.failUnlessEqual(str(e), "Bad admin module")
- else:
- self.fail(
- 'autodiscover should have raised a "Bad admin module" error.')
+ # Calling autodiscover again should raise the very same error it did
+ # the first time, not an AlreadyRegistered error.
+ try:
+ admin.autodiscover()
+ except Exception, e:
+ self.failUnlessEqual(str(e), "Bad admin module")
+ else:
+ self.fail(
+ 'autodiscover should have raised a "Bad admin module" error.')