Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed errors introduced in r14280 when running Django tests u…

…nder Python < 2.6.

Backport of [14287] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6a369d2ff385edd3bbc2b8e0ab659f8fdef767d3 1 parent ed195a6
@ramiro ramiro authored
Showing with 12 additions and 3 deletions.
  1. +12 −3 tests/regressiontests/queries/tests.py
View
15 tests/regressiontests/queries/tests.py
@@ -1430,7 +1430,8 @@ def test_evaluated_queryset_as_argument(self):
class EmptyQuerySetTests(TestCase):
def test_emptyqueryset_values(self):
- "#14366 -- calling .values() on an EmptyQuerySet and then cloning that should not cause an error"
+ # #14366 -- calling .values() on an EmptyQuerySet and then cloning that
+ # should not cause an error
self.assertEqual(list(Number.objects.none().values('num').order_by('num')), [])
def test_values_subquery(self):
@@ -1483,11 +1484,19 @@ def test_ticket_7302(self):
# the way Python handles list() calls internally. Thus, we skip the tests for
# Python 2.6.
if sys.version_info[:2] != (2, 6):
- class OrderingLoopTests(TestCase):
+ class OrderingLoopTests(BaseQuerysetTest):
+ def setUp(self):
+ generic = NamedCategory.objects.create(name="Generic")
+ t1 = Tag.objects.create(name='t1', category=generic)
+ t2 = Tag.objects.create(name='t2', parent=t1, category=generic)
+ t3 = Tag.objects.create(name='t3', parent=t1)
+ t4 = Tag.objects.create(name='t4', parent=t3)
+ t5 = Tag.objects.create(name='t5', parent=t3)
+
def test_infinite_loop(self):
# If you're not careful, it's possible to introduce infinite loops via
# default ordering on foreign keys in a cycle. We detect that.
- self.assertRaises(
+ self.assertRaisesMessage(
FieldError,
'Infinite loop caused by ordering.',
LoopX.objects.all

0 comments on commit 6a369d2

Please sign in to comment.
Something went wrong with that request. Please try again.