Răsfoiți Sursa

Move create_test_device() to testing utils

jeremystretch 4 ani în urmă
părinte
comite
b4b68c0b00
2 a modificat fișierele cu 16 adăugiri și 14 ștergeri
  1. 1 14
      netbox/dcim/tests/test_views.py
  2. 15 0
      netbox/utilities/testing/utils.py

+ 1 - 14
netbox/dcim/tests/test_views.py

@@ -12,20 +12,7 @@ from dcim.choices import *
 from dcim.constants import *
 from dcim.constants import *
 from dcim.models import *
 from dcim.models import *
 from ipam.models import VLAN
 from ipam.models import VLAN
-from utilities.testing import ViewTestCases
-
-
-def create_test_device(name):
-    """
-    Convenience method for creating a Device (e.g. for component testing).
-    """
-    site, _ = Site.objects.get_or_create(name='Site 1', slug='site-1')
-    manufacturer, _ = Manufacturer.objects.get_or_create(name='Manufacturer 1', slug='manufacturer-1')
-    devicetype, _ = DeviceType.objects.get_or_create(model='Device Type 1', manufacturer=manufacturer)
-    devicerole, _ = DeviceRole.objects.get_or_create(name='Device Role 1', slug='device-role-1')
-    device = Device.objects.create(name=name, site=site, device_type=devicetype, device_role=devicerole)
-
-    return device
+from utilities.testing import ViewTestCases, create_test_device
 
 
 
 
 class RegionTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 class RegionTestCase(ViewTestCases.OrganizationalObjectViewTestCase):

+ 15 - 0
netbox/utilities/testing/utils.py

@@ -4,6 +4,8 @@ from contextlib import contextmanager
 
 
 from django.contrib.auth.models import Permission, User
 from django.contrib.auth.models import Permission, User
 
 
+from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
+
 
 
 def post_data(data):
 def post_data(data):
     """
     """
@@ -29,6 +31,19 @@ def post_data(data):
     return ret
     return ret
 
 
 
 
+def create_test_device(name):
+    """
+    Convenience method for creating a Device (e.g. for component testing).
+    """
+    site, _ = Site.objects.get_or_create(name='Site 1', slug='site-1')
+    manufacturer, _ = Manufacturer.objects.get_or_create(name='Manufacturer 1', slug='manufacturer-1')
+    devicetype, _ = DeviceType.objects.get_or_create(model='Device Type 1', manufacturer=manufacturer)
+    devicerole, _ = DeviceRole.objects.get_or_create(name='Device Role 1', slug='device-role-1')
+    device = Device.objects.create(name=name, site=site, device_type=devicetype, device_role=devicerole)
+
+    return device
+
+
 def create_test_user(username='testuser', permissions=None):
 def create_test_user(username='testuser', permissions=None):
     """
     """
     Create a User with the given permissions.
     Create a User with the given permissions.