mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Used addCleanup() in tests where appropriate.

Browse Source
This commit is contained in:
Mariusz Felisiak
2023-12-31 10:01:31 +01:00
committed by GitHub
parent 81ccf92f15
commit d88ec42bd0
37 changed files with 121 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/mail/tests.py
View File

@@ -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()