From bb755daf8b8cdb7f326107b73c465364efccb556 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 17 Jun 2020 11:14:41 -0400 Subject: [PATCH] Update tests --- netbox/extras/tests/test_api.py | 2 +- netbox/extras/tests/test_changelog.py | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index 0c1fcd91c..5d7951e54 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -102,7 +102,7 @@ class ExportTemplateTest(APIViewTestCases.APIViewTestCase): class TagTest(APIViewTestCases.APIViewTestCase): model = Tag - brief_fields = ['color', 'id', 'name', 'slug', 'tagged_items', 'url'] + brief_fields = ['color', 'id', 'name', 'slug', 'url'] create_data = [ { 'name': 'Tag 4', diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py index 50d9c5be6..0c35e0f1a 100644 --- a/netbox/extras/tests/test_changelog.py +++ b/netbox/extras/tests/test_changelog.py @@ -11,7 +11,6 @@ from utilities.testing import APITestCase class ChangeLogTest(APITestCase): def setUp(self): - super().setUp() # Create a custom field on the Site model @@ -31,9 +30,6 @@ class ChangeLogTest(APITestCase): 'custom_fields': { 'my_field': 'ABC' }, - 'tags': [ - 'bar', 'foo' - ], } self.assertEqual(ObjectChange.objects.count(), 0) url = reverse('dcim-api:site-list') @@ -50,7 +46,6 @@ class ChangeLogTest(APITestCase): self.assertEqual(oc.changed_object, site) self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_CREATE) self.assertEqual(oc.object_data['custom_fields'], data['custom_fields']) - self.assertListEqual(sorted(oc.object_data['tags']), data['tags']) def test_update_object(self): site = Site(name='Test Site 1', slug='test-site-1') @@ -62,9 +57,6 @@ class ChangeLogTest(APITestCase): 'custom_fields': { 'my_field': 'DEF' }, - 'tags': [ - 'abc', 'xyz' - ], } self.assertEqual(ObjectChange.objects.count(), 0) self.add_permissions('dcim.change_site') @@ -81,7 +73,6 @@ class ChangeLogTest(APITestCase): self.assertEqual(oc.changed_object, site) self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_UPDATE) self.assertEqual(oc.object_data['custom_fields'], data['custom_fields']) - self.assertListEqual(sorted(oc.object_data['tags']), data['tags']) def test_delete_object(self): site = Site( @@ -89,7 +80,6 @@ class ChangeLogTest(APITestCase): slug='test-site-1' ) site.save() - site.tags.add('foo', 'bar') CustomFieldValue.objects.create( field=CustomField.objects.get(name='my_field'), obj=site, @@ -108,4 +98,3 @@ class ChangeLogTest(APITestCase): self.assertEqual(oc.object_repr, site.name) self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_DELETE) self.assertEqual(oc.object_data['custom_fields'], {'my_field': 'ABC'}) - self.assertListEqual(sorted(oc.object_data['tags']), ['bar', 'foo'])