From d88ec42bd0a37340c8477a6f20bf26e58bd84735 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 31 Dec 2023 10:01:31 +0100 Subject: [PATCH] Used addCleanup() in tests where appropriate. --- tests/app_loading/tests.py | 4 +- tests/asgi/tests.py | 4 +- tests/auth_tests/test_auth_backends.py | 21 ++++----- tests/auth_tests/test_management.py | 6 +-- tests/auth_tests/test_models.py | 4 +- tests/auth_tests/test_remote_user.py | 8 ++-- tests/auth_tests/test_signals.py | 11 ++--- tests/cache/tests.py | 13 ++---- tests/contenttypes_tests/test_models.py | 4 +- tests/contenttypes_tests/test_operations.py | 9 ++-- tests/custom_lookups/tests.py | 4 +- tests/defer_regress/tests.py | 11 +++-- tests/delete_regress/tests.py | 6 +-- tests/file_storage/tests.py | 46 ++++++------------- tests/forms_tests/tests/test_input_formats.py | 12 ++--- tests/gis_tests/utils.py | 11 ++--- tests/handlers/tests.py | 10 ++-- tests/httpwrappers/tests.py | 4 +- tests/i18n/patterns/tests.py | 4 +- tests/i18n/tests.py | 5 +- tests/logging_tests/tests.py | 12 ++--- tests/mail/tests.py | 22 +++------ tests/messages_tests/base.py | 8 ++-- tests/model_fields/test_imagefield.py | 13 ++---- tests/sessions_tests/tests.py | 6 +-- tests/settings_tests/tests.py | 4 +- tests/sites_tests/tests.py | 4 +- tests/staticfiles_tests/cases.py | 9 ++-- tests/staticfiles_tests/test_management.py | 10 ++-- tests/staticfiles_tests/test_storage.py | 22 ++++----- .../template_tests/syntax_tests/i18n/base.py | 4 +- tests/transactions/tests.py | 12 ++--- tests/utils_tests/test_archive.py | 6 +-- tests/utils_tests/test_autoreload.py | 18 +++----- tests/utils_tests/test_dateformat.py | 6 +-- tests/view_tests/tests/test_debug.py | 4 +- tests/wsgi/tests.py | 4 +- 37 files changed, 121 insertions(+), 240 deletions(-) diff --git a/tests/app_loading/tests.py b/tests/app_loading/tests.py index 1499115386..d8a837c2f6 100644 --- a/tests/app_loading/tests.py +++ b/tests/app_loading/tests.py @@ -8,9 +8,7 @@ from django.test.utils import extend_sys_path class EggLoadingTest(SimpleTestCase): def setUp(self): self.egg_dir = "%s/eggs" % os.path.dirname(__file__) - - def tearDown(self): - apps.clear_cache() + self.addCleanup(apps.clear_cache) def test_egg1(self): """Models module can be loaded from an app in an egg""" diff --git a/tests/asgi/tests.py b/tests/asgi/tests.py index ced24c658e..3aeade4c05 100644 --- a/tests/asgi/tests.py +++ b/tests/asgi/tests.py @@ -32,9 +32,7 @@ class ASGITest(SimpleTestCase): def setUp(self): request_started.disconnect(close_old_connections) - - def tearDown(self): - request_started.connect(close_old_connections) + self.addCleanup(request_started.connect, close_old_connections) async def test_get_asgi_application(self): """ diff --git a/tests/auth_tests/test_auth_backends.py b/tests/auth_tests/test_auth_backends.py index 81406f37e6..a7005de8a4 100644 --- a/tests/auth_tests/test_auth_backends.py +++ b/tests/auth_tests/test_auth_backends.py @@ -95,19 +95,16 @@ class BaseModelBackendTest: backend = "django.contrib.auth.backends.ModelBackend" def setUp(self): - self.patched_settings = modify_settings( + # The custom_perms test messes with ContentTypes, which will be cached. + # Flush the cache to ensure there are no side effects. + self.addCleanup(ContentType.objects.clear_cache) + patched_settings = modify_settings( AUTHENTICATION_BACKENDS={"append": self.backend}, ) - self.patched_settings.enable() + patched_settings.enable() + self.addCleanup(patched_settings.disable) self.create_users() - def tearDown(self): - self.patched_settings.disable() - # The custom_perms test messes with ContentTypes, which will - # be cached; flush the cache to ensure there are no side effects - # Refs #14975, #14925 - ContentType.objects.clear_cache() - def test_has_perm(self): user = self.UserModel._default_manager.get(pk=self.user.pk) self.assertIs(user.has_perm("auth.test"), False) @@ -615,9 +612,9 @@ class PermissionDeniedBackendTest(TestCase): def setUp(self): self.user_login_failed = [] signals.user_login_failed.connect(self.user_login_failed_listener) - - def tearDown(self): - signals.user_login_failed.disconnect(self.user_login_failed_listener) + self.addCleanup( + signals.user_login_failed.disconnect, self.user_login_failed_listener + ) def user_login_failed_listener(self, sender, credentials, **kwargs): self.user_login_failed.append(credentials) diff --git a/tests/auth_tests/test_management.py b/tests/auth_tests/test_management.py index 872fe75e8a..0cc56b6760 100644 --- a/tests/auth_tests/test_management.py +++ b/tests/auth_tests/test_management.py @@ -163,11 +163,9 @@ class ChangepasswordManagementCommandTestCase(TestCase): def setUp(self): self.stdout = StringIO() + self.addCleanup(self.stdout.close) self.stderr = StringIO() - - def tearDown(self): - self.stdout.close() - self.stderr.close() + self.addCleanup(self.stderr.close) @mock.patch.object(getpass, "getpass", return_value="password") def test_get_pass(self, mock_get_pass): diff --git a/tests/auth_tests/test_models.py b/tests/auth_tests/test_models.py index b9a006f96d..34f411f2f9 100644 --- a/tests/auth_tests/test_models.py +++ b/tests/auth_tests/test_models.py @@ -519,9 +519,7 @@ class TestCreateSuperUserSignals(TestCase): def setUp(self): self.signals_count = 0 post_save.connect(self.post_save_listener, sender=User) - - def tearDown(self): - post_save.disconnect(self.post_save_listener, sender=User) + self.addCleanup(post_save.disconnect, self.post_save_listener, sender=User) def test_create_user(self): User.objects.create_user("JohnDoe") diff --git a/tests/auth_tests/test_remote_user.py b/tests/auth_tests/test_remote_user.py index ea4399a44a..6066ab96e9 100644 --- a/tests/auth_tests/test_remote_user.py +++ b/tests/auth_tests/test_remote_user.py @@ -21,14 +21,12 @@ class RemoteUserTest(TestCase): known_user2 = "knownuser2" def setUp(self): - self.patched_settings = modify_settings( + patched_settings = modify_settings( AUTHENTICATION_BACKENDS={"append": self.backend}, MIDDLEWARE={"append": self.middleware}, ) - self.patched_settings.enable() - - def tearDown(self): - self.patched_settings.disable() + patched_settings.enable() + self.addCleanup(patched_settings.disable) def test_no_remote_user(self): """Users are not created when remote user is not specified.""" diff --git a/tests/auth_tests/test_signals.py b/tests/auth_tests/test_signals.py index b97377e2c9..c9a61ada0e 100644 --- a/tests/auth_tests/test_signals.py +++ b/tests/auth_tests/test_signals.py @@ -30,14 +30,13 @@ class SignalTestCase(TestCase): self.logged_out = [] self.login_failed = [] signals.user_logged_in.connect(self.listener_login) + self.addCleanup(signals.user_logged_in.disconnect, self.listener_login) signals.user_logged_out.connect(self.listener_logout) + self.addCleanup(signals.user_logged_out.disconnect, self.listener_logout) signals.user_login_failed.connect(self.listener_login_failed) - - def tearDown(self): - """Disconnect the listeners""" - signals.user_logged_in.disconnect(self.listener_login) - signals.user_logged_out.disconnect(self.listener_logout) - signals.user_login_failed.disconnect(self.listener_login_failed) + self.addCleanup( + signals.user_login_failed.disconnect, self.listener_login_failed + ) def test_login(self): # Only a successful login will trigger the success signal. diff --git a/tests/cache/tests.py b/tests/cache/tests.py index c2a1ebdbb8..e6ebb718f1 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -1155,11 +1155,7 @@ class DBCacheTests(BaseCacheTests, TransactionTestCase): # The super calls needs to happen first for the settings override. super().setUp() self.create_table() - - def tearDown(self): - # The super call needs to happen first because it uses the database. - super().tearDown() - self.drop_table() + self.addCleanup(self.drop_table) def create_table(self): management.call_command("createcachetable", verbosity=0) @@ -2509,12 +2505,9 @@ class CacheMiddlewareTest(SimpleTestCase): def setUp(self): self.default_cache = caches["default"] + self.addCleanup(self.default_cache.clear) self.other_cache = caches["other"] - - def tearDown(self): - self.default_cache.clear() - self.other_cache.clear() - super().tearDown() + self.addCleanup(self.other_cache.clear) def test_constructor(self): """ 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): diff --git a/tests/custom_lookups/tests.py b/tests/custom_lookups/tests.py index a636977b67..8fc31d4e6b 100644 --- a/tests/custom_lookups/tests.py +++ b/tests/custom_lookups/tests.py @@ -460,9 +460,7 @@ class YearLteTests(TestCase): def setUp(self): models.DateField.register_lookup(YearTransform) - - def tearDown(self): - models.DateField._unregister_lookup(YearTransform) + self.addCleanup(models.DateField._unregister_lookup, YearTransform) @unittest.skipUnless( connection.vendor == "postgresql", "PostgreSQL specific SQL used" diff --git a/tests/defer_regress/tests.py b/tests/defer_regress/tests.py index 3dfe96ddb3..10100e348d 100644 --- a/tests/defer_regress/tests.py +++ b/tests/defer_regress/tests.py @@ -322,12 +322,13 @@ class DeferDeletionSignalsTests(TestCase): self.post_delete_senders = [] for sender in self.senders: models.signals.pre_delete.connect(self.pre_delete_receiver, sender) + self.addCleanup( + models.signals.pre_delete.disconnect, self.pre_delete_receiver, sender + ) models.signals.post_delete.connect(self.post_delete_receiver, sender) - - def tearDown(self): - for sender in self.senders: - models.signals.pre_delete.disconnect(self.pre_delete_receiver, sender) - models.signals.post_delete.disconnect(self.post_delete_receiver, sender) + self.addCleanup( + models.signals.post_delete.disconnect, self.post_delete_receiver, sender + ) def pre_delete_receiver(self, sender, **kwargs): self.pre_delete_senders.append(sender) diff --git a/tests/delete_regress/tests.py b/tests/delete_regress/tests.py index 71e3bcb405..89f4d5ddd8 100644 --- a/tests/delete_regress/tests.py +++ b/tests/delete_regress/tests.py @@ -51,11 +51,9 @@ class DeleteLockingTest(TransactionTestCase): # Create a second connection to the default database self.conn2 = connection.copy() self.conn2.set_autocommit(False) - - def tearDown(self): # Close down the second connection. - self.conn2.rollback() - self.conn2.close() + self.addCleanup(self.conn2.close) + self.addCleanup(self.conn2.rollback) def test_concurrent_delete(self): """Concurrent deletes don't collide and lock the database (#9479).""" diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py index 8c47e43742..637de0a3c9 100644 --- a/tests/file_storage/tests.py +++ b/tests/file_storage/tests.py @@ -71,16 +71,10 @@ class FileStorageTests(SimpleTestCase): def setUp(self): self.temp_dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.temp_dir) self.storage = self.storage_class( location=self.temp_dir, base_url="/test_media_url/" ) - # Set up a second temporary directory which is ensured to have a mixed - # case name. - self.temp_dir2 = tempfile.mkdtemp(suffix="aBc") - - def tearDown(self): - shutil.rmtree(self.temp_dir) - shutil.rmtree(self.temp_dir2) def test_empty_location(self): """ @@ -414,14 +408,16 @@ class FileStorageTests(SimpleTestCase): """The storage backend should preserve case of filenames.""" # Create a storage backend associated with the mixed case name # directory. - other_temp_storage = self.storage_class(location=self.temp_dir2) + temp_dir2 = tempfile.mkdtemp(suffix="aBc") + self.addCleanup(shutil.rmtree, temp_dir2) + other_temp_storage = self.storage_class(location=temp_dir2) # Ask that storage backend to store a file with a mixed case filename. mixed_case = "CaSe_SeNsItIvE" file = other_temp_storage.open(mixed_case, "w") file.write("storage contents") file.close() self.assertEqual( - os.path.join(self.temp_dir2, mixed_case), + os.path.join(temp_dir2, mixed_case), other_temp_storage.path(mixed_case), ) other_temp_storage.delete(mixed_case) @@ -917,9 +913,7 @@ class FieldCallableFileStorageTests(SimpleTestCase): self.temp_storage_location = tempfile.mkdtemp( suffix="filefield_callable_storage" ) - - def tearDown(self): - shutil.rmtree(self.temp_storage_location) + self.addCleanup(shutil.rmtree, self.temp_storage_location) def test_callable_base_class_error_raises(self): class NotStorage: @@ -993,12 +987,10 @@ class SlowFile(ContentFile): class FileSaveRaceConditionTest(SimpleTestCase): def setUp(self): self.storage_dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.storage_dir) self.storage = FileSystemStorage(self.storage_dir) self.thread = threading.Thread(target=self.save_file, args=["conflict"]) - def tearDown(self): - shutil.rmtree(self.storage_dir) - def save_file(self, name): name = self.storage.save(name, SlowFile(b"Data")) @@ -1017,12 +1009,10 @@ class FileSaveRaceConditionTest(SimpleTestCase): class FileStoragePermissions(unittest.TestCase): def setUp(self): self.umask = 0o027 - self.old_umask = os.umask(self.umask) + old_umask = os.umask(self.umask) + self.addCleanup(os.umask, old_umask) self.storage_dir = tempfile.mkdtemp() - - def tearDown(self): - shutil.rmtree(self.storage_dir) - os.umask(self.old_umask) + self.addCleanup(shutil.rmtree, self.storage_dir) @override_settings(FILE_UPLOAD_PERMISSIONS=0o654) def test_file_upload_permissions(self): @@ -1059,11 +1049,9 @@ class FileStoragePermissions(unittest.TestCase): class FileStoragePathParsing(SimpleTestCase): def setUp(self): self.storage_dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.storage_dir) self.storage = FileSystemStorage(self.storage_dir) - def tearDown(self): - shutil.rmtree(self.storage_dir) - def test_directory_with_dot(self): """Regression test for #9610. @@ -1095,11 +1083,9 @@ class FileStoragePathParsing(SimpleTestCase): class ContentFileStorageTestCase(unittest.TestCase): def setUp(self): - self.storage_dir = tempfile.mkdtemp() - self.storage = FileSystemStorage(self.storage_dir) - - def tearDown(self): - shutil.rmtree(self.storage_dir) + storage_dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, storage_dir) + self.storage = FileSystemStorage(storage_dir) def test_content_saving(self): """ @@ -1120,11 +1106,9 @@ class FileLikeObjectTestCase(LiveServerTestCase): def setUp(self): self.temp_dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.temp_dir) self.storage = FileSystemStorage(location=self.temp_dir) - def tearDown(self): - shutil.rmtree(self.temp_dir) - def test_urllib_request_urlopen(self): """ Test the File storage API with a file-like object coming from diff --git a/tests/forms_tests/tests/test_input_formats.py b/tests/forms_tests/tests/test_input_formats.py index 1923319759..7a0dfca8a7 100644 --- a/tests/forms_tests/tests/test_input_formats.py +++ b/tests/forms_tests/tests/test_input_formats.py @@ -12,9 +12,7 @@ class LocalizedTimeTests(SimpleTestCase): # nl/formats.py has customized TIME_INPUT_FORMATS: # ['%H:%M:%S', '%H.%M:%S', '%H.%M', '%H:%M'] activate("nl") - - def tearDown(self): - deactivate() + self.addCleanup(deactivate) def test_timeField(self): "TimeFields can parse dates in the default format" @@ -323,9 +321,7 @@ class SimpleTimeFormatTests(SimpleTestCase): class LocalizedDateTests(SimpleTestCase): def setUp(self): activate("de") - - def tearDown(self): - deactivate() + self.addCleanup(deactivate) def test_dateField(self): "DateFields can parse dates in the default format" @@ -637,9 +633,7 @@ class SimpleDateFormatTests(SimpleTestCase): class LocalizedDateTimeTests(SimpleTestCase): def setUp(self): activate("de") - - def tearDown(self): - deactivate() + self.addCleanup(deactivate) def test_dateTimeField(self): "DateTimeFields can parse dates in the default format" diff --git a/tests/gis_tests/utils.py b/tests/gis_tests/utils.py index 2fbfd438eb..2431ba4cec 100644 --- a/tests/gis_tests/utils.py +++ b/tests/gis_tests/utils.py @@ -64,12 +64,7 @@ class FuncTestMixin: vendor_impl = "as_" + connection.vendor __getattribute__original = Func.__getattribute__ - self.func_patcher = mock.patch.object( - Func, "__getattribute__", __getattribute__ - ) - self.func_patcher.start() + func_patcher = mock.patch.object(Func, "__getattribute__", __getattribute__) + func_patcher.start() + self.addCleanup(func_patcher.stop) super().setUp() - - def tearDown(self): - super().tearDown() - self.func_patcher.stop() diff --git a/tests/handlers/tests.py b/tests/handlers/tests.py index ab3837d25e..76d99e2504 100644 --- a/tests/handlers/tests.py +++ b/tests/handlers/tests.py @@ -16,9 +16,7 @@ class HandlerTests(SimpleTestCase): def setUp(self): request_started.disconnect(close_old_connections) - - def tearDown(self): - request_started.connect(close_old_connections) + self.addCleanup(request_started.connect, close_old_connections) def test_middleware_initialized(self): handler = WSGIHandler() @@ -150,11 +148,9 @@ class SignalsTests(SimpleTestCase): self.signals = [] self.signaled_environ = None request_started.connect(self.register_started) + self.addCleanup(request_started.disconnect, self.register_started) request_finished.connect(self.register_finished) - - def tearDown(self): - request_started.disconnect(self.register_started) - request_finished.disconnect(self.register_finished) + self.addCleanup(request_finished.disconnect, self.register_finished) def register_started(self, **kwargs): self.signals.append("started") diff --git a/tests/httpwrappers/tests.py b/tests/httpwrappers/tests.py index 0a41ea5ec6..cce8402d3f 100644 --- a/tests/httpwrappers/tests.py +++ b/tests/httpwrappers/tests.py @@ -762,9 +762,7 @@ class FileCloseTests(SimpleTestCase): # Disable the request_finished signal during this test # to avoid interfering with the database connection. request_finished.disconnect(close_old_connections) - - def tearDown(self): - request_finished.connect(close_old_connections) + self.addCleanup(request_finished.connect, close_old_connections) def test_response(self): filename = os.path.join(os.path.dirname(__file__), "abc.txt") diff --git a/tests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py index df55a1ee13..e2fee904b1 100644 --- a/tests/i18n/patterns/tests.py +++ b/tests/i18n/patterns/tests.py @@ -52,10 +52,8 @@ class URLTestCaseBase(SimpleTestCase): def setUp(self): # Make sure the cache is empty before we are doing our tests. clear_url_caches() - - def tearDown(self): # Make sure we will leave an empty cache for other testcases. - clear_url_caches() + self.addCleanup(clear_url_caches) class URLPrefixTests(URLTestCaseBase): diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index d44ddb9f83..355505a10d 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -1756,10 +1756,7 @@ class ResolutionOrderI18NTests(SimpleTestCase): def setUp(self): super().setUp() activate("de") - - def tearDown(self): - deactivate() - super().tearDown() + self.addCleanup(deactivate) def assertGettext(self, msgid, msgstr): result = gettext(msgid) diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py index c73a3acd6d..20d2852fde 100644 --- a/tests/logging_tests/tests.py +++ b/tests/logging_tests/tests.py @@ -579,20 +579,18 @@ args=(sys.stdout,) [formatter_simple] format=%(message)s """ - self.temp_file = NamedTemporaryFile() - self.temp_file.write(logging_conf.encode()) - self.temp_file.flush() + temp_file = NamedTemporaryFile() + temp_file.write(logging_conf.encode()) + temp_file.flush() + self.addCleanup(temp_file.close) self.write_settings( "settings.py", sdict={ "LOGGING_CONFIG": '"logging.config.fileConfig"', - "LOGGING": 'r"%s"' % self.temp_file.name, + "LOGGING": 'r"%s"' % temp_file.name, }, ) - def tearDown(self): - self.temp_file.close() - def test_custom_logging(self): out, err = self.run_manage(["check"]) self.assertNoOutput(err) diff --git a/tests/mail/tests.py b/tests/mail/tests.py index 6f92194d1b..73eceafa46 100644 --- a/tests/mail/tests.py +++ b/tests/mail/tests.py @@ -1173,11 +1173,9 @@ class BaseEmailBackendTests(HeadersCheckMixin): email_backend = None def setUp(self): - self.settings_override = override_settings(EMAIL_BACKEND=self.email_backend) - self.settings_override.enable() - - def tearDown(self): - self.settings_override.disable() + settings_override = override_settings(EMAIL_BACKEND=self.email_backend) + settings_override.enable() + self.addCleanup(settings_override.disable) def assertStartsWith(self, first, second): if not first.startswith(second): @@ -1575,12 +1573,9 @@ class FileBackendTests(BaseEmailBackendTests, SimpleTestCase): super().setUp() self.tmp_dir = self.mkdtemp() self.addCleanup(shutil.rmtree, self.tmp_dir) - self._settings_override = override_settings(EMAIL_FILE_PATH=self.tmp_dir) - self._settings_override.enable() - - def tearDown(self): - self._settings_override.disable() - super().tearDown() + _settings_override = override_settings(EMAIL_FILE_PATH=self.tmp_dir) + _settings_override.enable() + self.addCleanup(_settings_override.disable) def mkdtemp(self): return tempfile.mkdtemp() @@ -1754,10 +1749,7 @@ class SMTPBackendTests(BaseEmailBackendTests, SMTPBackendTestsBase): def setUp(self): super().setUp() self.smtp_handler.flush_mailbox() - - def tearDown(self): - self.smtp_handler.flush_mailbox() - super().tearDown() + self.addCleanup(self.smtp_handler.flush_mailbox) def flush_mailbox(self): self.smtp_handler.flush_mailbox() diff --git a/tests/messages_tests/base.py b/tests/messages_tests/base.py index 6fe8892ac1..34582b5462 100644 --- a/tests/messages_tests/base.py +++ b/tests/messages_tests/base.py @@ -32,7 +32,7 @@ class BaseTests: } def setUp(self): - self.settings_override = override_settings( + settings_override = override_settings( TEMPLATES=[ { "BACKEND": "django.template.backends.django.DjangoTemplates", @@ -52,10 +52,8 @@ class BaseTests: % (self.storage_class.__module__, self.storage_class.__name__), SESSION_SERIALIZER="django.contrib.sessions.serializers.JSONSerializer", ) - self.settings_override.enable() - - def tearDown(self): - self.settings_override.disable() + settings_override.enable() + self.addCleanup(settings_override.disable) def get_request(self): return HttpRequest() diff --git a/tests/model_fields/test_imagefield.py b/tests/model_fields/test_imagefield.py index 8bbfee30f2..8c93ed1bdb 100644 --- a/tests/model_fields/test_imagefield.py +++ b/tests/model_fields/test_imagefield.py @@ -55,20 +55,13 @@ class ImageFieldTestMixin(SerializeMixin): if os.path.exists(temp_storage_dir): shutil.rmtree(temp_storage_dir) os.mkdir(temp_storage_dir) - + self.addCleanup(shutil.rmtree, temp_storage_dir) file_path1 = os.path.join(os.path.dirname(__file__), "4x8.png") self.file1 = self.File(open(file_path1, "rb"), name="4x8.png") - + self.addCleanup(self.file1.close) file_path2 = os.path.join(os.path.dirname(__file__), "8x4.png") self.file2 = self.File(open(file_path2, "rb"), name="8x4.png") - - def tearDown(self): - """ - Removes temp directory and all its contents. - """ - self.file1.close() - self.file2.close() - shutil.rmtree(temp_storage_dir) + self.addCleanup(self.file2.close) def check_dimensions(self, instance, width, height, field_name="mugshot"): """ diff --git a/tests/sessions_tests/tests.py b/tests/sessions_tests/tests.py index 5a80a7b211..7e0677d08d 100644 --- a/tests/sessions_tests/tests.py +++ b/tests/sessions_tests/tests.py @@ -49,12 +49,10 @@ class SessionTestsMixin: def setUp(self): self.session = self.backend() - - def tearDown(self): # NB: be careful to delete any sessions created; stale sessions fill up # the /tmp (with some backends) and eventually overwhelm it after lots # of runs (think buildbots) - self.session.delete() + self.addCleanup(self.session.delete) def test_new_session(self): self.assertIs(self.session.modified, False) @@ -532,6 +530,7 @@ class FileSessionTests(SessionTestsMixin, SimpleTestCase): # Do file session tests in an isolated directory, and kill it after we're done. self.original_session_file_path = settings.SESSION_FILE_PATH self.temp_session_store = settings.SESSION_FILE_PATH = self.mkdtemp() + self.addCleanup(shutil.rmtree, self.temp_session_store) # Reset the file session backend's internal caches if hasattr(self.backend, "_storage_path"): del self.backend._storage_path @@ -540,7 +539,6 @@ class FileSessionTests(SessionTestsMixin, SimpleTestCase): def tearDown(self): super().tearDown() settings.SESSION_FILE_PATH = self.original_session_file_path - shutil.rmtree(self.temp_session_store) def mkdtemp(self): return tempfile.mkdtemp() diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py index b2044878c9..4fc35689d6 100644 --- a/tests/settings_tests/tests.py +++ b/tests/settings_tests/tests.py @@ -156,9 +156,7 @@ class SettingsTests(SimpleTestCase): def setUp(self): self.testvalue = None signals.setting_changed.connect(self.signal_callback) - - def tearDown(self): - signals.setting_changed.disconnect(self.signal_callback) + self.addCleanup(signals.setting_changed.disconnect, self.signal_callback) def signal_callback(self, sender, setting, value, **kwargs): if setting == "TEST": diff --git a/tests/sites_tests/tests.py b/tests/sites_tests/tests.py index f0ac9dc2ec..4f5b07ee8f 100644 --- a/tests/sites_tests/tests.py +++ b/tests/sites_tests/tests.py @@ -27,9 +27,7 @@ class SitesFrameworkTests(TestCase): def setUp(self): Site.objects.clear_cache() - - def tearDown(self): - Site.objects.clear_cache() + self.addCleanup(Site.objects.clear_cache) def test_site_manager(self): # Make sure that get_current() does not return a deleted Site object. 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() diff --git a/tests/staticfiles_tests/test_management.py b/tests/staticfiles_tests/test_management.py index 46e6f3e764..c0d3817383 100644 --- a/tests/staticfiles_tests/test_management.py +++ b/tests/staticfiles_tests/test_management.py @@ -468,18 +468,14 @@ class TestCollectionFilesOverride(CollectionTestCase): os.utime(self.testfile_path, (self.orig_atime - 1, self.orig_mtime - 1)) - self.settings_with_test_app = self.modify_settings( + settings_with_test_app = self.modify_settings( INSTALLED_APPS={"prepend": "staticfiles_test_app"}, ) with extend_sys_path(self.temp_dir): - self.settings_with_test_app.enable() - + settings_with_test_app.enable() + self.addCleanup(settings_with_test_app.disable) super().setUp() - def tearDown(self): - super().tearDown() - self.settings_with_test_app.disable() - def test_ordering_override(self): """ Test if collectstatic takes files in proper order diff --git a/tests/staticfiles_tests/test_storage.py b/tests/staticfiles_tests/test_storage.py index ea2293ccde..1e537dfe54 100644 --- a/tests/staticfiles_tests/test_storage.py +++ b/tests/staticfiles_tests/test_storage.py @@ -417,16 +417,15 @@ class TestCollectionManifestStorage(TestHashedFiles, CollectionTestCase): with open(self._clear_filename, "w") as f: f.write("to be deleted in one test") - self.patched_settings = self.settings( + patched_settings = self.settings( STATICFILES_DIRS=settings.STATICFILES_DIRS + [temp_dir], ) - self.patched_settings.enable() + patched_settings.enable() + self.addCleanup(patched_settings.disable) self.addCleanup(shutil.rmtree, temp_dir) self._manifest_strict = storage.staticfiles_storage.manifest_strict def tearDown(self): - self.patched_settings.disable() - if os.path.exists(self._clear_filename): os.unlink(self._clear_filename) @@ -702,13 +701,13 @@ class CustomManifestStorage(storage.ManifestStaticFilesStorage): class TestCustomManifestStorage(SimpleTestCase): def setUp(self): - self.manifest_path = Path(tempfile.mkdtemp()) - self.addCleanup(shutil.rmtree, self.manifest_path) + manifest_path = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, manifest_path) self.staticfiles_storage = CustomManifestStorage( - manifest_location=self.manifest_path, + manifest_location=manifest_path, ) - self.manifest_file = self.manifest_path / self.staticfiles_storage.manifest_name + self.manifest_file = manifest_path / self.staticfiles_storage.manifest_name # Manifest without paths. self.manifest = {"version": self.staticfiles_storage.manifest_version} with self.manifest_file.open("w") as manifest_file: @@ -762,13 +761,10 @@ class TestStaticFilePermissions(CollectionTestCase): def setUp(self): self.umask = 0o027 - self.old_umask = os.umask(self.umask) + old_umask = os.umask(self.umask) + self.addCleanup(os.umask, old_umask) super().setUp() - def tearDown(self): - os.umask(self.old_umask) - super().tearDown() - # Don't run collectstatic command in this test class. def run_collectstatic(self, **kwargs): pass diff --git a/tests/template_tests/syntax_tests/i18n/base.py b/tests/template_tests/syntax_tests/i18n/base.py index 6197179ee4..ff21405e5e 100644 --- a/tests/template_tests/syntax_tests/i18n/base.py +++ b/tests/template_tests/syntax_tests/i18n/base.py @@ -19,6 +19,4 @@ class MultipleLocaleActivationTestCase(SimpleTestCase): def setUp(self): self._old_language = get_language() - - def tearDown(self): - activate(self._old_language) + self.addCleanup(activate, self._old_language) diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py index 2419eb47f2..9fe8c58593 100644 --- a/tests/transactions/tests.py +++ b/tests/transactions/tests.py @@ -259,12 +259,10 @@ class AtomicWithoutAutocommitTests(AtomicTests): def setUp(self): transaction.set_autocommit(False) - - def tearDown(self): + self.addCleanup(transaction.set_autocommit, True) # The tests access the database after exercising 'atomic', initiating # a transaction ; a rollback is required before restoring autocommit. - transaction.rollback() - transaction.set_autocommit(True) + self.addCleanup(transaction.rollback) @skipUnlessDBFeature("uses_savepoints") @@ -512,10 +510,8 @@ class NonAutocommitTests(TransactionTestCase): def setUp(self): transaction.set_autocommit(False) - - def tearDown(self): - transaction.rollback() - transaction.set_autocommit(True) + self.addCleanup(transaction.set_autocommit, True) + self.addCleanup(transaction.rollback) def test_orm_query_after_error_and_rollback(self): """ 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) diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index 65f9db89bf..54c5da056e 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -1904,9 +1904,7 @@ class CustomExceptionReporterFilter(SafeExceptionReporterFilter): class CustomExceptionReporterFilterTests(SimpleTestCase): def setUp(self): get_default_exception_reporter_filter.cache_clear() - - def tearDown(self): - get_default_exception_reporter_filter.cache_clear() + self.addCleanup(get_default_exception_reporter_filter.cache_clear) def test_setting_allows_custom_subclass(self): self.assertIsInstance( diff --git a/tests/wsgi/tests.py b/tests/wsgi/tests.py index b1b5a7d00e..39d72d7697 100644 --- a/tests/wsgi/tests.py +++ b/tests/wsgi/tests.py @@ -14,9 +14,7 @@ class WSGITest(SimpleTestCase): def setUp(self): request_started.disconnect(close_old_connections) - - def tearDown(self): - request_started.connect(close_old_connections) + self.addCleanup(request_started.connect, close_old_connections) def test_get_wsgi_application(self): """