Commit 6824c9b7 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Ensure that assertNumQueries doesn't swallow exceptions inside the function. 

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

django/test/testcases.py

+4 −1
Original line number Diff line number Diff line
@@ -524,7 +524,10 @@ class TransactionTestCase(ut2.TestCase): 
        context.__enter__()

        try:

            func(*args, **kwargs)

        finally:

        except:

            context.__exit__(*sys.exc_info())

            raise

        else:

            context.__exit__(*sys.exc_info())



def connections_support_transactions():

tests/regressiontests/test_utils/tests.py

+8 −0
Original line number Diff line number Diff line
@@ -8,6 +8,14 @@ if sys.version_info >= (2, 5): 




class SkippingTestCase(TestCase):

    def test_assert_num_queries(self):

        def test_func():

            raise ValueError



        self.assertRaises(ValueError,

            self.assertNumQueries, 2, test_func

        )



    def test_skip_unless_db_feature(self):

        "A test that might be skipped is actually called."

        # Total hack, but it works, just want an attribute that's always true.