test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
Ramiro Morales 2010-10-19 19:42:36 +00:00
parent ed195a6fd3
commit 6a369d2ff3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/regressiontests/queries/tests.py
View File

@ -1430,7 +1430,8 @@ class CloneTests(TestCase):
class EmptyQuerySetTests(TestCase): class EmptyQuerySetTests(TestCase):
def test_emptyqueryset_values(self): 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')), []) self.assertEqual(list(Number.objects.none().values('num').order_by('num')), [])
def test_values_subquery(self): 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 # the way Python handles list() calls internally. Thus, we skip the tests for
# Python 2.6. # Python 2.6.
if sys.version_info[:2] != (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): def test_infinite_loop(self):
# If you're not careful, it's possible to introduce infinite loops via # If you're not careful, it's possible to introduce infinite loops via
# default ordering on foreign keys in a cycle. We detect that. # default ordering on foreign keys in a cycle. We detect that.
self.assertRaises( self.assertRaisesMessage(
FieldError, FieldError,
'Infinite loop caused by ordering.', 'Infinite loop caused by ordering.',
LoopX.objects.all LoopX.objects.all