Commit a360240c authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Fixed a couple of tests migrated to unit tests in r14279 so they actually and... 

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent bc27405f

tests/regressiontests/queries/tests.py

+8 −2
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ class BaseQuerysetTest(TestCase): 
        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 @@ class ConditionalTests(BaseQuerysetTest): 
        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