From ed3c2c8529e6d1d32e2aeace749f64107c16294a Mon Sep 17 00:00:00 2001 From: Ariel Rin Date: Sat, 3 Jun 2023 17:08:06 +1000 Subject: [PATCH] dj4.1 #31395 changed testdata upstream, breaks setting up classes or something --- allianceauth/services/modules/teamspeak3/tests.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/allianceauth/services/modules/teamspeak3/tests.py b/allianceauth/services/modules/teamspeak3/tests.py index f0f8d1c3..62f9ad85 100644 --- a/allianceauth/services/modules/teamspeak3/tests.py +++ b/allianceauth/services/modules/teamspeak3/tests.py @@ -454,20 +454,16 @@ request.user = MockSuperUser() class Teamspeak3AdminTestCase(TestCase): @classmethod def setUpTestData(cls): - cls.site = AdminSite() - cls.admin = AuthTSgroupAdmin(AuthTS, cls.site) cls.group = Group.objects.create(name='test') cls.ts_group = TSgroup.objects.create(ts_group_id=1, ts_group_name='test') def test_field_queryset_no_reserved_names(self): """Ensure all groups are listed when no reserved names""" - form = self.admin.get_form(request) - self.assertQuerySetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.all()) - self.assertQuerySetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.all()) + self.assertQuerySetEqual(AuthTSgroupAdmin(AuthTS, AdminSite()).get_form(request).base_fields['auth_group']._get_queryset(), Group.objects.all()) + self.assertQuerySetEqual(AuthTSgroupAdmin(AuthTS, AdminSite()).get_form(request).base_fields['ts_group']._get_queryset(), TSgroup.objects.all()) def test_field_queryset_reserved_names(self): """Ensure reserved group names are filtered out""" ReservedGroupName.objects.bulk_create([ReservedGroupName(name='test', reason='tests', created_by='Bob')]) - form = self.admin.get_form(request) - self.assertQuerySetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.none()) - self.assertQuerySetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.none()) + self.assertQuerySetEqual(AuthTSgroupAdmin(AuthTS, AdminSite()).get_form(request).base_fields['auth_group']._get_queryset(), Group.objects.none()) + self.assertQuerySetEqual(AuthTSgroupAdmin(AuthTS, AdminSite()).get_form(request).base_fields['ts_group']._get_queryset(), TSgroup.objects.none())