Used addCleanup() in tests where appropriate.

1 files changed, 3 insertions, 6 deletions

diff --git a/tests/staticfiles_tests/cases.py b/tests/staticfiles_tests/cases.py
index 5e8b150b33..a4816bc09a 100644
--- a/tests/staticfiles_tests/cases.py
+++ b/tests/staticfiles_tests/cases.py
@@ -71,16 +71,13 @@ class CollectionTestCase(BaseStaticFilesMixin, SimpleTestCase):
         temp_dir = self.mkdtemp()
         # Override the STATIC_ROOT for all tests from setUp to tearDown
         # rather than as a context manager
-        self.patched_settings = self.settings(STATIC_ROOT=temp_dir)
-        self.patched_settings.enable()
+        patched_settings = self.settings(STATIC_ROOT=temp_dir)
+        patched_settings.enable()
         if self.run_collectstatic_in_setUp:
             self.run_collectstatic()
         # Same comment as in runtests.teardown.
         self.addCleanup(shutil.rmtree, temp_dir)
-
-    def tearDown(self):
-        self.patched_settings.disable()
-        super().tearDown()
+        self.addCleanup(patched_settings.disable)
 
     def mkdtemp(self):
         return tempfile.mkdtemp()