Merge branch 'develop' into 2921-tags-select2

netbox/ipam/tests/test_api.py

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

netbox/netbox/settings.py

@@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
 # Environment setup
 #
 
-VERSION = '2.7.0-dev'
+VERSION = '2.7.0'
 
 # Hostname
 HOSTNAME = platform.node()

netbox/utilities/testing.py

@@ -20,7 +20,7 @@ class APITestCase(_APITestCase):
         """
         err_message = "Expected HTTP status {}; received {}: {}"
         self.assertEqual(response.status_code, expected_status, err_message.format(
-            expected_status, response.status_code, response.data
+            expected_status, response.status_code, getattr(response, 'data', 'No data')
         ))