Used addCleanup() in tests where appropriate.

3 files changed, 11 insertions, 19 deletions

diff --git a/tests/utils_tests/test_archive.py b/tests/utils_tests/test_archive.py
index 8cd107063f..89a45bc072 100644
--- a/tests/utils_tests/test_archive.py
+++ b/tests/utils_tests/test_archive.py
@@ -26,11 +26,9 @@ except ImportError:
 class TestArchive(unittest.TestCase):
     def setUp(self):
         self.testdir = os.path.join(os.path.dirname(__file__), "archives")
-        self.old_cwd = os.getcwd()
+        old_cwd = os.getcwd()
         os.chdir(self.testdir)
-
-    def tearDown(self):
-        os.chdir(self.old_cwd)
+        self.addCleanup(os.chdir, old_cwd)
 
     def test_extract_function(self):
         with os.scandir(self.testdir) as entries:
diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py
index fd33506499..83f3e3898f 100644
--- a/tests/utils_tests/test_autoreload.py
+++ b/tests/utils_tests/test_autoreload.py
@@ -315,14 +315,12 @@ class TestCommonRoots(SimpleTestCase):
 
 class TestSysPathDirectories(SimpleTestCase):
     def setUp(self):
-        self._directory = tempfile.TemporaryDirectory()
-        self.directory = Path(self._directory.name).resolve(strict=True).absolute()
+        _directory = tempfile.TemporaryDirectory()
+        self.addCleanup(_directory.cleanup)
+        self.directory = Path(_directory.name).resolve(strict=True).absolute()
         self.file = self.directory / "test"
         self.file.touch()
 
-    def tearDown(self):
-        self._directory.cleanup()
-
     def test_sys_paths_with_directories(self):
         with extend_sys_path(str(self.file)):
             paths = list(autoreload.sys_path_directories())
@@ -542,15 +540,13 @@ class ReloaderTests(SimpleTestCase):
     RELOADER_CLS = None
 
     def setUp(self):
-        self._tempdir = tempfile.TemporaryDirectory()
-        self.tempdir = Path(self._tempdir.name).resolve(strict=True).absolute()
+        _tempdir = tempfile.TemporaryDirectory()
+        self.tempdir = Path(_tempdir.name).resolve(strict=True).absolute()
         self.existing_file = self.ensure_file(self.tempdir / "test.py")
         self.nonexistent_file = (self.tempdir / "does_not_exist.py").absolute()
         self.reloader = self.RELOADER_CLS()
-
-    def tearDown(self):
-        self._tempdir.cleanup()
-        self.reloader.stop()
+        self.addCleanup(self.reloader.stop)
+        self.addCleanup(_tempdir.cleanup)
 
     def ensure_file(self, path):
         path.parent.mkdir(exist_ok=True, parents=True)
diff --git a/tests/utils_tests/test_dateformat.py b/tests/utils_tests/test_dateformat.py
index dce678e172..33e2c57333 100644
--- a/tests/utils_tests/test_dateformat.py
+++ b/tests/utils_tests/test_dateformat.py
@@ -10,11 +10,9 @@ from django.utils.timezone import get_default_timezone, get_fixed_timezone, make
 @override_settings(TIME_ZONE="Europe/Copenhagen")
 class DateFormatTests(SimpleTestCase):
     def setUp(self):
-        self._orig_lang = translation.get_language()
+        _orig_lang = translation.get_language()
         translation.activate("en-us")
-
-    def tearDown(self):
-        translation.activate(self._orig_lang)
+        self.addCleanup(translation.activate, _orig_lang)
 
     def test_date(self):
         d = date(2009, 5, 16)