diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 235f35192..ecaf32a06 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -14,6 +14,9 @@ from wireless.choices import WirelessChannelChoices from wireless.models import WirelessLAN +User = get_user_model() + + class AppTest(APITestCase): def test_root(self): @@ -363,7 +366,7 @@ class RackReservationTest(APIViewTestCases.APIViewTestCase): @classmethod def setUpTestData(cls): - user = get_user_model().objects.create(username='user1', is_active=True) + user = User.objects.create(username='user1', is_active=True) site = Site.objects.create(name='Test Site 1', slug='test-site-1') racks = ( diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index 73e07025d..4c48aa73e 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -15,6 +15,9 @@ from extras.scripts import BooleanVar, IntegerVar, Script, StringVar from utilities.testing import APITestCase, APIViewTestCases +User = get_user_model() + + class AppTest(APITestCase): def test_root(self): @@ -396,7 +399,7 @@ class JournalEntryTest(APIViewTestCases.APIViewTestCase): @classmethod def setUpTestData(cls): - user = get_user_model().objects.first() + user = User.objects.first() site = Site.objects.create(name='Site 1', slug='site-1') journal_entries = ( diff --git a/netbox/users/tests/test_preferences.py b/netbox/users/tests/test_preferences.py index 2776e6344..203a67bdd 100644 --- a/netbox/users/tests/test_preferences.py +++ b/netbox/users/tests/test_preferences.py @@ -16,6 +16,9 @@ DEFAULT_USER_PREFERENCES = { } +User = get_user_model() + + class UserPreferencesTest(TestCase): user_permissions = ['dcim.view_site'] @@ -39,7 +42,7 @@ class UserPreferencesTest(TestCase): @override_settings(DEFAULT_USER_PREFERENCES=DEFAULT_USER_PREFERENCES) def test_default_preferences(self): - user = get_user_model().objects.create(username='User 1') + user = User.objects.create(username='User 1') userconfig = user.config self.assertEqual(userconfig.data, DEFAULT_USER_PREFERENCES) diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py index 816037b0c..8cfe1cdd7 100644 --- a/netbox/utilities/testing/api.py +++ b/netbox/utilities/testing/api.py @@ -26,6 +26,9 @@ __all__ = ( ) +User = get_user_model() + + # # REST/GraphQL API Tests # @@ -45,7 +48,7 @@ class APITestCase(ModelTestCase): Create a user and token for API calls. """ # Create the test user and assign permissions - self.user = get_user_model().objects.create_user(username='testuser') + self.user = User.objects.create_user(username='testuser') self.add_permissions(*self.user_permissions) self.token = Token.objects.create(user=self.user) self.header = {'HTTP_AUTHORIZATION': f'Token {self.token.key}'}