From 25a55c56c8243d537416e231eea3ceefcb1720a2 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Tue, 25 Jun 2024 13:06:31 -0700 Subject: [PATCH] 12826 fix tests --- netbox/dcim/forms/bulk_edit.py | 4 ++-- netbox/dcim/tests/test_views.py | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 3f8258299..0cdfd2454 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -282,7 +282,7 @@ class RackTypeBulkEditForm(NetBoxModelBulkEditForm): ) comments = CommentField() - model = Rack + model = RackType fieldsets = ( FieldSet('description', name=_('Rack')), FieldSet( @@ -292,7 +292,7 @@ class RackTypeBulkEditForm(NetBoxModelBulkEditForm): FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')), ) nullable_fields = ( - 'role', 'outer_width', 'outer_depth', 'outer_unit', 'weight', + 'outer_width', 'outer_depth', 'outer_unit', 'weight', 'max_weight', 'weight_unit', 'description', 'comments', ) diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index 52c859d0f..556159096 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -343,16 +343,16 @@ class RackTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase): def setUpTestData(cls): racks = ( - Rack(name='Rack 1'), - Rack(name='Rack 2'), - Rack(name='Rack 3'), + Rack(name='RackType 1'), + Rack(name='RackType 2'), + Rack(name='RackType 3'), ) RackType.objects.bulk_create(racks) tags = create_tags('Alpha', 'Bravo', 'Charlie') cls.form_data = { - 'name': 'Rack X', + 'name': 'RackType X', 'type': RackTypeChoices.TYPE_CABINET, 'width': RackWidthChoices.WIDTH_19IN, 'u_height': 48, @@ -370,16 +370,16 @@ class RackTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase): cls.csv_data = ( "name,width,u_height,weight,max_weight,weight_unit", - "Rack 4,19,42,100,2000,kg", - "Rack 5,19,42,100,2000,kg", - "Rack 6,19,42,100,2000,kg", + "RackType 4,19,42,100,2000,kg", + "RackType 5,19,42,100,2000,kg", + "RackType 6,19,42,100,2000,kg", ) cls.csv_update_data = ( "id,name", - f"{racks[0].pk},Rack 7", - f"{racks[1].pk},Rack 8", - f"{racks[2].pk},Rack 9", + f"{racks[0].pk},RackType 7", + f"{racks[1].pk},RackType 8", + f"{racks[2].pk},RackType 9", ) cls.bulk_edit_data = {