starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-26 02:38:48 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2021-08-10 21:03:10 -04:00
parent 6d27e11043 db359719a9
commit 736da4bcad
15 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1741,10 +1741,10 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
}
cls.csv_data = (
"device,name",
"Device 1,Inventory Item 4",
"Device 1,Inventory Item 5",
"Device 1,Inventory Item 6",
"device,name,parent",
"Device 1,Inventory Item 4,Inventory Item 1",
"Device 1,Inventory Item 5,Inventory Item 2",
"Device 1,Inventory Item 6,Inventory Item 3",
)