mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41: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

21
tests/auth_tests/test_auth_backends.py
View File

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

6
tests/auth_tests/test_management.py
View File

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

4
tests/auth_tests/test_models.py
View File

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

8
tests/auth_tests/test_remote_user.py
View File

@@ -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."""

11
tests/auth_tests/test_signals.py
View File

@@ -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.