NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 16:48:16 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

12826 fix tests

Browse Source
This commit is contained in:
Arthur Hanson 2024-06-25 13:06:31 -07:00
parent b6a785d24a
commit 25a55c56c8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/forms/bulk_edit.py
View File

@ -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',
)

20
netbox/dcim/tests/test_views.py
View File

@ -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 = {