Removed some direct settings manipulations in tests; refs #21230.

1 files changed, 4 insertions, 10 deletions

diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py
index 44a7851720..926d156303 100644
--- a/tests/test_client/tests.py
+++ b/tests/test_client/tests.py
@@ -467,17 +467,11 @@ class ClientTest(TestCase):
         self.assertEqual(mail.outbox[1].to[0], 'second@example.com')
         self.assertEqual(mail.outbox[1].to[1], 'third@example.com')
 
-class CSRFEnabledClientTests(TestCase):
-    def setUp(self):
-        # Enable the CSRF middleware for this test
-        self.old_MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES
-        csrf_middleware_class = 'django.middleware.csrf.CsrfViewMiddleware'
-        if csrf_middleware_class not in settings.MIDDLEWARE_CLASSES:
-            settings.MIDDLEWARE_CLASSES += (csrf_middleware_class,)
-
-    def tearDown(self):
-        settings.MIDDLEWARE_CLASSES = self.old_MIDDLEWARE_CLASSES
 
+@override_settings(
+    MIDDLEWARE_CLASSES = ('django.middleware.csrf.CsrfViewMiddleware',)
+)
+class CSRFEnabledClientTests(TestCase):
     def test_csrf_enabled_client(self):
         "A client can be instantiated with CSRF checks enabled"
         csrf_client = Client(enforce_csrf_checks=True)