Used addCleanup() in tests where appropriate.

2 files changed, 5 insertions, 8 deletions

diff --git a/tests/contenttypes_tests/test_models.py b/tests/contenttypes_tests/test_models.py
index 36c14cf56f..02036de83f 100644
--- a/tests/contenttypes_tests/test_models.py
+++ b/tests/contenttypes_tests/test_models.py
@@ -12,9 +12,7 @@ from .models import Author, ConcreteModel, FooWithUrl, ProxyModel
 class ContentTypesTests(TestCase):
     def setUp(self):
         ContentType.objects.clear_cache()
-
-    def tearDown(self):
-        ContentType.objects.clear_cache()
+        self.addCleanup(ContentType.objects.clear_cache)
 
     def test_lookup_cache(self):
         """
diff --git a/tests/contenttypes_tests/test_operations.py b/tests/contenttypes_tests/test_operations.py
index a2bff373a4..d44648d9fe 100644
--- a/tests/contenttypes_tests/test_operations.py
+++ b/tests/contenttypes_tests/test_operations.py
@@ -29,11 +29,10 @@ class ContentTypeOperationsTests(TransactionTestCase):
         models.signals.post_migrate.connect(
             self.assertOperationsInjected, sender=app_config
         )
-
-    def tearDown(self):
-        app_config = apps.get_app_config("contenttypes_tests")
-        models.signals.post_migrate.disconnect(
-            self.assertOperationsInjected, sender=app_config
+        self.addCleanup(
+            models.signals.post_migrate.disconnect,
+            self.assertOperationsInjected,
+            sender=app_config,
         )
 
     def assertOperationsInjected(self, plan, **kwargs):