Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a couple of tests migrated to unit tests in r14279 so they actu…

…ally and correctly exercise the functionality under test.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a360240c56a47752f65146777c0f1d9055a86bc8 1 parent bc27405
Ramiro Morales ramiro authored
Showing with 8 additions and 2 deletions.
  1. +8 −2 tests/regressiontests/queries/tests.py
10 tests/regressiontests/queries/tests.py
View
@@ -27,6 +27,12 @@ def assertRaisesMessage(self, exc, msg, func, *args, **kwargs):
except Exception, e:
self.assertEqual(msg, str(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):
@@ -1528,12 +1534,12 @@ def test_infinite_loop(self):
self.assertRaisesMessage(
FieldError,
'Infinite loop caused by ordering.',
- LoopX.objects.all
+ lambda: list(LoopX.objects.all()) # Force queryset evaluation with list()
)
self.assertRaisesMessage(
FieldError,
'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
Please sign in to comment.
Something went wrong with that request. Please try again.