Просмотр исходного кода

Use assertHttpStatus() when evaluating HTTP response status

Jeremy Stretch 6 лет назад
Родитель
Сommit
fecbb60c36
2 измененных файлов с 2 добавлено и 3 удалено
  1. 1 2
      netbox/ipam/tests/test_api.py
  2. 1 1
      netbox/utilities/testing.py

+ 1 - 2
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)

+ 1 - 1
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')
         ))