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 568-csv-import-cf

Browse Source
This commit is contained in:
hSaria
2020-01-16 22:47:10 +00:00
committed by GitHub
parent 9f68f8d1a6 0f1518e4c5
commit c0a3285b8b
7 changed files with 93 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1009,8 +1009,7 @@ class VLANTest(APITestCase):
url = reverse('ipam-api:vlan-detail', kwargs={'pk': self.vlan1.pk})
response = self.client.delete(url, **self.header)
# can't use assertHttpStatus here because we don't have response.data
self.assertEqual(response.status_code, 409)
self.assertHttpStatus(response, status.HTTP_409_CONFLICT)
content = json.loads(response.content.decode('utf-8'))
self.assertIn('detail', content)