NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Update tests to match new string representation of ContentTypes

Browse Source
This commit is contained in:
Jeremy Stretch 2020-02-19 15:31:15 -05:00
parent 7b93155b06
commit be23230938
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ class AppTest(APITestCase):
self.assertEqual(choices_to_dict(response.data.get('cable:status')), CableStatusChoices.as_dict()) self.assertEqual(choices_to_dict(response.data.get('cable:status')), CableStatusChoices.as_dict())
content_types = ContentType.objects.filter(CABLE_TERMINATION_MODELS) content_types = ContentType.objects.filter(CABLE_TERMINATION_MODELS)
cable_termination_choices = { cable_termination_choices = {
"{}.{}".format(ct.app_label, ct.model): ct.name for ct in content_types "{}.{}".format(ct.app_label, ct.model): str(ct) for ct in content_types
} }
self.assertEqual(choices_to_dict(response.data.get('cable:termination_a_type')), cable_termination_choices) self.assertEqual(choices_to_dict(response.data.get('cable:termination_a_type')), cable_termination_choices)
self.assertEqual(choices_to_dict(response.data.get('cable:termination_b_type')), cable_termination_choices) self.assertEqual(choices_to_dict(response.data.get('cable:termination_b_type')), cable_termination_choices)

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

@ -37,7 +37,7 @@ class AppTest(APITestCase):
# Graph # Graph
content_types = ContentType.objects.filter(GRAPH_MODELS) content_types = ContentType.objects.filter(GRAPH_MODELS)
graph_type_choices = { graph_type_choices = {
"{}.{}".format(ct.app_label, ct.model): ct.name for ct in content_types "{}.{}".format(ct.app_label, ct.model): str(ct) for ct in content_types
} }
self.assertEqual(choices_to_dict(response.data.get('graph:type')), graph_type_choices) self.assertEqual(choices_to_dict(response.data.get('graph:type')), graph_type_choices)
self.assertEqual(choices_to_dict(response.data.get('graph:template_language')), TemplateLanguageChoices.as_dict()) self.assertEqual(choices_to_dict(response.data.get('graph:template_language')), TemplateLanguageChoices.as_dict())