Author: ramiro
Date: 2010-10-19 14:42:36 -0500 (Tue, 19 Oct 2010)
New Revision: 14289
Modified:
django/branches/releases/1.2.X/tests/regressiontests/queries/tests.py
Log:
[1.2.X] Fixed errors introduced in r14280 when running Django tests under
Python < 2.6.
Backport of [14287] from trunk.
Modified: django/branches/releases/1.2.X/tests/regressiontests/queries/tests.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/queries/tests.py
2010-10-19 19:38:15 UTC (rev 14288)
+++ django/branches/releases/1.2.X/tests/regressiontests/queries/tests.py
2010-10-19 19:42:36 UTC (rev 14289)
@@ -1430,7 +1430,8 @@
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 @@
# 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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
