1 files changed, 32 insertions, 39 deletions
diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
index eb850cc3be..1b3c78b2e2 100644
--- a/tests/test_utils/tests.py
+++ b/tests/test_utils/tests.py
@@ -152,9 +152,8 @@ class CaptureQueriesContextManagerTests(TestCase):
         self.assertEqual(2, len(captured_queries))
 
     def test_failure(self):
-        with self.assertRaises(TypeError):
-            with CaptureQueriesContext(connection):
-                raise TypeError
+        with self.assertRaises(TypeError), CaptureQueriesContext(connection):
+            raise TypeError
 
     def test_with_client(self):
         with CaptureQueriesContext(connection) as captured_queries:
@@ -190,14 +189,12 @@ class AssertNumQueriesContextManagerTests(TestCase):
             Person.objects.count()
 
     def test_failure(self):
-        with self.assertRaises(AssertionError) as exc_info:
-            with self.assertNumQueries(2):
-                Person.objects.count()
+        with self.assertRaises(AssertionError) as exc_info, self.assertNumQueries(2):
+            Person.objects.count()
         self.assertIn("1 queries executed, 2 expected", str(exc_info.exception))
 
-        with self.assertRaises(TypeError):
-            with self.assertNumQueries(4000):
-                raise TypeError
+        with self.assertRaises(TypeError), self.assertNumQueries(4000):
+            raise TypeError
 
     def test_with_client(self):
         person = Person.objects.create(name="test")
@@ -232,13 +229,13 @@ class AssertTemplateUsedContextManagerTests(TestCase):
             render_to_string('template_used/base.html')
 
     def test_nested_usage(self):
-        with self.assertTemplateUsed('template_used/base.html'):
-            with self.assertTemplateUsed('template_used/include.html'):
-                render_to_string('template_used/include.html')
+        with self.assertTemplateUsed('template_used/base.html'), \
+                self.assertTemplateUsed('template_used/include.html'):
+            render_to_string('template_used/include.html')
 
-        with self.assertTemplateUsed('template_used/extends.html'):
-            with self.assertTemplateUsed('template_used/base.html'):
-                render_to_string('template_used/extends.html')
+        with self.assertTemplateUsed('template_used/extends.html'), \
+                self.assertTemplateUsed('template_used/base.html'):
+            render_to_string('template_used/extends.html')
 
         with self.assertTemplateUsed('template_used/base.html'):
             with self.assertTemplateUsed('template_used/alternative.html'):
@@ -258,38 +255,34 @@ class AssertTemplateUsedContextManagerTests(TestCase):
             pass
 
     def test_error_message(self):
-        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'):
-            with self.assertTemplateUsed('template_used/base.html'):
-                pass
+        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'), \
+                self.assertTemplateUsed('template_used/base.html'):
+            pass
 
-        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'):
-            with self.assertTemplateUsed(template_name='template_used/base.html'):
-                pass
+        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'), \
+                self.assertTemplateUsed(template_name='template_used/base.html'):
+            pass
 
-        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html.*template_used/alternative\.html$'):
-            with self.assertTemplateUsed('template_used/base.html'):
-                render_to_string('template_used/alternative.html')
+        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html.*template_used/alternative\.html$'), \
+                self.assertTemplateUsed('template_used/base.html'):
+            render_to_string('template_used/alternative.html')
 
     def test_failure(self):
-        with self.assertRaises(TypeError):
-            with self.assertTemplateUsed():
-                pass
+        with self.assertRaises(TypeError), self.assertTemplateUsed():
+            pass
 
-        with self.assertRaises(AssertionError):
-            with self.assertTemplateUsed(''):
-                pass
+        with self.assertRaises(AssertionError), self.assertTemplateUsed(''):
+            pass
 
-        with self.assertRaises(AssertionError):
-            with self.assertTemplateUsed(''):
-                render_to_string('template_used/base.html')
+        with self.assertRaises(AssertionError), self.assertTemplateUsed(''):
+            render_to_string('template_used/base.html')
 
-        with self.assertRaises(AssertionError):
-            with self.assertTemplateUsed(template_name=''):
-                pass
+        with self.assertRaises(AssertionError), self.assertTemplateUsed(template_name=''):
+            pass
 
-        with self.assertRaises(AssertionError):
-            with self.assertTemplateUsed('template_used/base.html'):
-                render_to_string('template_used/alternative.html')
+        with self.assertRaises(AssertionError), \
+                self.assertTemplateUsed('template_used/base.html'):
+            render_to_string('template_used/alternative.html')
 
 
 class HTMLEqualTests(TestCase):