Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.2.X] Fixed a couple of tests migrated to unit tests in r14279 so they actually and correctly exercise the functionality under test.

Browse Source 
Backport of [14981] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2010-12-18 23:10:29 +00:00
parent 160533410f
commit d5c15a490e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,12 @@ class BaseQuerysetTest(TestCase):
except Exception, e: except Exception, e:
self.assertEqual(msg, str(e)) self.assertEqual(msg, str(e))
self.assertTrue(isinstance(e, exc), "Expected %s, got %s" % (exc, type(e))) self.assertTrue(isinstance(e, exc), "Expected %s, got %s" % (exc, type(e)))
else:
if hasattr(exc, '__name__'):
excName = exc.__name__
else:
excName = str(exc)
raise AssertionError, "%s not raised" % excName
class Queries1Tests(BaseQuerysetTest): class Queries1Tests(BaseQuerysetTest):
@ -1516,12 +1522,12 @@ if sys.version_info[:2] != (2, 6):
self.assertRaisesMessage( self.assertRaisesMessage(
FieldError, FieldError,
'Infinite loop caused by ordering.', 'Infinite loop caused by ordering.',
LoopX.objects.all lambda: list(LoopX.objects.all()) # Force queryset evaluation with list()
) )
self.assertRaisesMessage( self.assertRaisesMessage(
FieldError, FieldError,
'Infinite loop caused by ordering.', 'Infinite loop caused by ordering.',
LoopZ.objects.all lambda: list(LoopZ.objects.all()) # Force queryset evaluation with list()
) )
# Note that this doesn't cause an infinite loop, since the default # Note that this doesn't cause an infinite loop, since the default