From e4f336a843adee098913b872e1de22b7281ed5f7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 8 Jun 2018 14:32:41 -0400 Subject: [PATCH] Establish tests for the utilities app --- netbox/circuits/tests/test_api.py | 2 +- netbox/dcim/tests/test_api.py | 2 +- netbox/extras/tests/test_api.py | 2 +- netbox/extras/tests/test_customfields.py | 2 +- netbox/ipam/tests/test_api.py | 2 +- netbox/secrets/tests/test_api.py | 2 +- netbox/tenancy/tests/test_api.py | 2 +- netbox/utilities/{tests.py => testing.py} | 0 netbox/utilities/tests/__init__.py | 0 netbox/utilities/tests/test_managers.py | 0 netbox/virtualization/tests/test_api.py | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename netbox/utilities/{tests.py => testing.py} (100%) create mode 100644 netbox/utilities/tests/__init__.py create mode 100644 netbox/utilities/tests/test_managers.py diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py index 39a2d69f2..3c1337ef2 100644 --- a/netbox/circuits/tests/test_api.py +++ b/netbox/circuits/tests/test_api.py @@ -11,7 +11,7 @@ from dcim.models import Site from extras.constants import GRAPH_TYPE_PROVIDER from extras.models import Graph from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin class ProviderTest(HttpStatusMixin, APITestCase): diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 6614f8068..1d9ba74ba 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -18,7 +18,7 @@ from dcim.models import ( from ipam.models import VLAN from extras.models import Graph, GRAPH_TYPE_INTERFACE, GRAPH_TYPE_SITE from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin class RegionTest(HttpStatusMixin, APITestCase): diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index f0cdb5dfe..4b6b78891 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -11,7 +11,7 @@ from dcim.models import Device from extras.constants import GRAPH_TYPE_SITE from extras.models import Graph, ExportTemplate from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin class GraphTest(HttpStatusMixin, APITestCase): diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index b10db514e..805ee5543 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -13,7 +13,7 @@ from dcim.models import Site from extras.constants import CF_TYPE_TEXT, CF_TYPE_INTEGER, CF_TYPE_BOOLEAN, CF_TYPE_DATE, CF_TYPE_SELECT, CF_TYPE_URL from extras.models import CustomField, CustomFieldValue, CustomFieldChoice from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin class CustomFieldTest(TestCase): diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index 505d914a0..27fa92dfd 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -10,7 +10,7 @@ from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site from ipam.constants import IP_PROTOCOL_TCP, IP_PROTOCOL_UDP from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin class VRFTest(HttpStatusMixin, APITestCase): diff --git a/netbox/secrets/tests/test_api.py b/netbox/secrets/tests/test_api.py index 0bf93eafd..583997612 100644 --- a/netbox/secrets/tests/test_api.py +++ b/netbox/secrets/tests/test_api.py @@ -10,7 +10,7 @@ from rest_framework.test import APITestCase from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site from secrets.models import Secret, SecretRole, SessionKey, UserKey from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin # Dummy RSA key pair for testing use only PRIVATE_KEY = """-----BEGIN RSA PRIVATE KEY----- diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py index f1238eddb..64fb80f86 100644 --- a/netbox/tenancy/tests/test_api.py +++ b/netbox/tenancy/tests/test_api.py @@ -7,7 +7,7 @@ from rest_framework.test import APITestCase from tenancy.models import Tenant, TenantGroup from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin class TenantGroupTest(HttpStatusMixin, APITestCase): diff --git a/netbox/utilities/tests.py b/netbox/utilities/testing.py similarity index 100% rename from netbox/utilities/tests.py rename to netbox/utilities/testing.py diff --git a/netbox/utilities/tests/__init__.py b/netbox/utilities/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/netbox/utilities/tests/test_managers.py b/netbox/utilities/tests/test_managers.py new file mode 100644 index 000000000..e69de29bb diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index 1f9e72ee5..275d0c123 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -6,7 +6,7 @@ from rest_framework import status from rest_framework.test import APITestCase from users.models import Token -from utilities.tests import HttpStatusMixin +from utilities.testing import HttpStatusMixin from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine