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
2025-10-24 06:06:09 +00:00 · 2010-10-31 08:29:07 +00:00
parent 429473a522
commit 6824c9b796
2 changed files with 12 additions and 1 deletions
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -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():