From a5dc0807dbfddcb568f6e19df11fe1b87e0a8d44 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 21 Mar 2025 10:08:08 -0700 Subject: [PATCH] 18245 fix tests --- netbox/dcim/graphql/types.py | 1 + netbox/dcim/tests/test_filtersets.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index 3bc5c9f5f..bc2e3ab2e 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -328,6 +328,7 @@ class InventoryItemTemplateType(ComponentTemplateType): filters=DeviceRoleFilter ) class DeviceRoleType(OrganizationalObjectType): + group: Annotated['DeviceRoleGroupType', strawberry.lazy('dcim.graphql.types')] | None color: str config_template: Annotated["ConfigTemplateType", strawberry.lazy('extras.graphql.types')] | None diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index e3b9108f5..d207734ea 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -2236,11 +2236,11 @@ class DeviceRoleGroupTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) def test_name(self): - params = {'name': ['Tenant Group 1', 'Tenant Group 2']} + params = {'name': ['Device Role Group 1', 'Device Role Group 2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_slug(self): - params = {'slug': ['tenant-group-1', 'tenant-group-2']} + params = {'slug': ['device-role-group-1', 'device-role-group-2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_description(self): @@ -2248,17 +2248,17 @@ class DeviceRoleGroupTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_parent(self): - tenant_groups = TenantGroup.objects.filter(parent__isnull=True)[:2] - params = {'parent_id': [tenant_groups[0].pk, tenant_groups[1].pk]} + device_role_groups = DeviceRoleGroup.objects.filter(parent__isnull=True)[:2] + params = {'parent_id': [device_role_groups[0].pk, device_role_groups[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - params = {'parent': [tenant_groups[0].slug, tenant_groups[1].slug]} + params = {'parent': [device_role_groups[0].slug, device_role_groups[1].slug]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_ancestor(self): - tenant_groups = TenantGroup.objects.filter(parent__isnull=True)[:2] - params = {'ancestor_id': [tenant_groups[0].pk, tenant_groups[1].pk]} + device_role_groups = DeviceRoleGroup.objects.filter(parent__isnull=True)[:2] + params = {'ancestor_id': [device_role_groups[0].pk, device_role_groups[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) - params = {'ancestor': [tenant_groups[0].slug, tenant_groups[1].slug]} + params = {'ancestor': [device_role_groups[0].slug, device_role_groups[1].slug]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)