Commit 6a369d2f authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.2.X] Fixed errors introduced in r14280 when running Django tests under 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
parent ed195a6f
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -1430,7 +1430,8 @@ class CloneTests(TestCase):

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 @@ class EscapingTests(TestCase):
# 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