From 635fefcb5c5bad6a224e62b2a6a47b3bf2561415 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 22 May 2020 16:33:56 -0400 Subject: [PATCH] Update exempted tests --- netbox/dcim/tests/test_views.py | 20 +++++++++++++++----- netbox/extras/tests/test_views.py | 20 +++++++++++++++----- netbox/ipam/tests/test_views.py | 4 +++- netbox/secrets/tests/test_views.py | 8 ++++++-- netbox/utilities/testing/testcases.py | 2 +- netbox/virtualization/tests/test_views.py | 8 ++++++-- 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index 65f37c1d5..ef8bd3d5f 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -794,7 +794,9 @@ class DeviceBayTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCas model = DeviceBayTemplate # Disable inapplicable views - test_bulk_edit_objects = None + test_bulk_edit_objects_without_permission = None + test_bulk_edit_objects_with_model_permission = None + test_bulk_edit_objects_with_object_permission = None @classmethod def setUpTestData(cls): @@ -1439,7 +1441,9 @@ class CableTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = Cable # TODO: Creation URL needs termination context - test_create_object = None + test_create_object_without_permission = None + test_create_object_with_model_permission = None + test_create_object_with_object_permission = None @classmethod def setUpTestData(cls): @@ -1513,11 +1517,17 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = VirtualChassis # Disable inapplicable tests - test_import_objects = None + test_bulk_import_objects_without_permission = None + test_bulk_import_objects_with_model_permission = None + test_bulk_import_objects_with_object_permission = None # TODO: Requires special form handling - test_create_object = None - test_edit_object = None + test_create_object_without_permission = None + test_create_object_with_model_permission = None + test_create_object_with_object_permission = None + test_edit_object_without_permission = None + test_edit_object_with_model_permission = None + test_edit_object_with_object_permission = None @classmethod def setUpTestData(cls): diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py index 370055b26..f52054cc1 100644 --- a/netbox/extras/tests/test_views.py +++ b/netbox/extras/tests/test_views.py @@ -14,8 +14,12 @@ class TagTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = Tag # Disable inapplicable tests - test_create_object = None - test_import_objects = None + test_create_object_without_permission = None + test_create_object_with_model_permission = None + test_create_object_with_object_permission = None + test_bulk_import_objects_without_permission = None + test_bulk_import_objects_with_model_permission = None + test_bulk_import_objects_with_object_permission = None @classmethod def setUpTestData(cls): @@ -42,11 +46,17 @@ class ConfigContextTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = ConfigContext # Disable inapplicable tests - test_import_objects = None + test_bulk_import_objects_without_permission = None + test_bulk_import_objects_with_model_permission = None + test_bulk_import_objects_with_object_permission = None # TODO: Resolve model discrepancies when creating/editing ConfigContexts - test_create_object = None - test_edit_object = None + test_create_object_without_permission = None + test_create_object_with_model_permission = None + test_create_object_with_object_permission = None + test_edit_object_without_permission = None + test_edit_object_with_model_permission = None + test_edit_object_with_object_permission = None @classmethod def setUpTestData(cls): diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index 8867a6b43..bbd252473 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -337,7 +337,9 @@ class ServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = Service # TODO: Resolve URL for Service creation - test_create_object = None + test_create_object_without_permission = None + test_create_object_with_model_permission = None + test_create_object_with_object_permission = None @classmethod def setUpTestData(cls): diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py index 96439a10d..7796be63d 100644 --- a/netbox/secrets/tests/test_views.py +++ b/netbox/secrets/tests/test_views.py @@ -40,10 +40,14 @@ class SecretTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = Secret # Disable inapplicable tests - test_create_object = None + test_create_object_without_permission = None + test_create_object_with_model_permission = None + test_create_object_with_object_permission = None # TODO: Check permissions enforcement on secrets.views.secret_edit - test_edit_object = None + test_edit_object_without_permission = None + test_edit_object_with_model_permission = None + test_edit_object_with_object_permission = None @classmethod def setUpTestData(cls): diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py index ca9df4ac8..475cdb09f 100644 --- a/netbox/utilities/testing/testcases.py +++ b/netbox/utilities/testing/testcases.py @@ -351,7 +351,7 @@ class ViewTestCases: # Try GET without permission with disable_warnings('django.request'): - self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 403) + self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 403) # Try POST without permission request = { diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py index e7bb19285..006db34d6 100644 --- a/netbox/virtualization/tests/test_views.py +++ b/netbox/virtualization/tests/test_views.py @@ -192,8 +192,12 @@ class InterfaceTestCase( model = Interface # Disable inapplicable tests - test_list_objects = None - test_import_objects = None + test_list_objects_without_permission = None + test_list_objects_with_model_permission = None + test_list_objects_with_object_permission = None + test_bulk_import_objects_without_permission = None + test_bulk_import_objects_with_model_permission = None + test_bulk_import_objects_with_object_permission = None def _get_base_url(self): # Interface belongs to the DCIM app, so we have to override the base URL