mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2023-04-07 13:00:00 -04:00
parent 6d6299f0cb 9f71cf79e6
commit 08017c51f6
39 changed files with 166 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/tests/test_api.py
View File

@@ -952,7 +952,7 @@ class VLANTest(APIViewTestCases.APIViewTestCase):
self.add_permissions('ipam.delete_vlan')
url = reverse('ipam-api:vlan-detail', kwargs={'pk': vlan.pk})
with disable_warnings('django.request'):
with disable_warnings('netbox.api.views.ModelViewSet'):
response = self.client.delete(url, **self.header)
self.assertHttpStatus(response, status.HTTP_409_CONFLICT)