Refs #31395 -- Relied on setUpTestData() test data isolation in various tests.

2 files changed, 13 insertions, 9 deletions

diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py
index fec06c3446..ca7c7a4c41 100644
--- a/tests/admin_utils/test_logentry.py
+++ b/tests/admin_utils/test_logentry.py
@@ -15,19 +15,22 @@ from .models import Article, ArticleProxy, Site
 
 @override_settings(ROOT_URLCONF='admin_utils.urls')
 class LogEntryTests(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
-        self.site = Site.objects.create(domain='example.org')
-        self.a1 = Article.objects.create(
-            site=self.site,
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = User.objects.create_superuser(username='super', password='secret', email='super@example.com')
+        cls.site = Site.objects.create(domain='example.org')
+        cls.a1 = Article.objects.create(
+            site=cls.site,
             title="Title",
             created=datetime(2008, 3, 12, 11, 54),
         )
         content_type_pk = ContentType.objects.get_for_model(Article).pk
         LogEntry.objects.log_action(
-            self.user.pk, content_type_pk, self.a1.pk, repr(self.a1), CHANGE,
+            cls.user.pk, content_type_pk, cls.a1.pk, repr(cls.a1), CHANGE,
             change_message='Changed something'
         )
+
+    def setUp(self):
         self.client.force_login(self.user)
 
     def test_logentry_save(self):
diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py
index cf0d3e064e..8e50556c75 100644
--- a/tests/admin_utils/tests.py
+++ b/tests/admin_utils/tests.py
@@ -22,9 +22,10 @@ class NestedObjectsTests(TestCase):
     """
     Tests for ``NestedObject`` utility collection.
     """
-    def setUp(self):
-        self.n = NestedObjects(using=DEFAULT_DB_ALIAS)
-        self.objs = [Count.objects.create(num=i) for i in range(5)]
+    @classmethod
+    def setUpTestData(cls):
+        cls.n = NestedObjects(using=DEFAULT_DB_ALIAS)
+        cls.objs = [Count.objects.create(num=i) for i in range(5)]
 
     def _check(self, target):
         self.assertEqual(self.n.nested(lambda obj: obj.num), target)