#9045 fix tests

netbox/circuits/tests/test_filtersets.py

@@ -25,11 +25,11 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests):
         ASN.objects.bulk_create(asns)
 
         providers = (
-            Provider(name='Provider 1', slug='provider-1', asn=65001, account='1234'),
+            Provider(name='Provider 1', slug='provider-1', account='1234'),
-            Provider(name='Provider 2', slug='provider-2', asn=65002, account='2345'),
+            Provider(name='Provider 2', slug='provider-2', account='2345'),
-            Provider(name='Provider 3', slug='provider-3', asn=65003, account='3456'),
+            Provider(name='Provider 3', slug='provider-3', account='3456'),
-            Provider(name='Provider 4', slug='provider-4', asn=65004, account='4567'),
+            Provider(name='Provider 4', slug='provider-4', account='4567'),
-            Provider(name='Provider 5', slug='provider-5', asn=65005, account='5678'),
+            Provider(name='Provider 5', slug='provider-5', account='5678'),
         )
         Provider.objects.bulk_create(providers)
         providers[0].asns.set([asns[0]])
@@ -82,10 +82,6 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests):
         params = {'slug': ['provider-1', 'provider-2']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
-    def test_asn(self):  # Legacy field
-        params = {'asn': ['65001', '65002']}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-
     def test_asn_id(self):  # ASN object assignment
         asns = ASN.objects.all()[:2]
         params = {'asn_id': [asns[0].pk, asns[1].pk]}

netbox/circuits/tests/test_views.py

@@ -23,9 +23,9 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         ASN.objects.bulk_create(asns)
 
         providers = (
-            Provider(name='Provider 1', slug='provider-1', asn=65001),
+            Provider(name='Provider 1', slug='provider-1'),
-            Provider(name='Provider 2', slug='provider-2', asn=65002),
+            Provider(name='Provider 2', slug='provider-2'),
-            Provider(name='Provider 3', slug='provider-3', asn=65003),
+            Provider(name='Provider 3', slug='provider-3'),
         )
         Provider.objects.bulk_create(providers)
         providers[0].asns.set([asns[0], asns[1]])
@@ -96,8 +96,8 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     def setUpTestData(cls):
 
         providers = (
-            Provider(name='Provider 1', slug='provider-1', asn=65001),
+            Provider(name='Provider 1', slug='provider-1'),
-            Provider(name='Provider 2', slug='provider-2', asn=65002),
+            Provider(name='Provider 2', slug='provider-2'),
         )
         Provider.objects.bulk_create(providers)
 

netbox/extras/tests/test_customvalidator.py

@@ -14,20 +14,6 @@ class MyValidator(CustomValidator):
             self.fail("Name must be foo!")
 
 
-min_validator = CustomValidator({
-    'asn': {
-        'min': 65000
-    }
-})
-
-
-max_validator = CustomValidator({
-    'asn': {
-        'max': 65100
-    }
-})
-
-
 min_length_validator = CustomValidator({
     'name': {
         'min_length': 5
@@ -67,22 +53,6 @@ custom_validator = MyValidator()
 
 class CustomValidatorTest(TestCase):
 
-    @override_settings(CUSTOM_VALIDATORS={'circuits.provider': [min_validator]})
-    def test_configuration(self):
-        self.assertIn('circuits.provider', settings.CUSTOM_VALIDATORS)
-        validator = settings.CUSTOM_VALIDATORS['circuits.provider'][0]
-        self.assertIsInstance(validator, CustomValidator)
-
-    @override_settings(CUSTOM_VALIDATORS={'circuits.provider': [min_validator]})
-    def test_min(self):
-        with self.assertRaises(ValidationError):
-            Provider(name='Provider 1', slug='provider-1', asn=1).clean()
-
-    @override_settings(CUSTOM_VALIDATORS={'circuits.provider': [max_validator]})
-    def test_max(self):
-        with self.assertRaises(ValidationError):
-            Provider(name='Provider 1', slug='provider-1', asn=65535).clean()
-
     @override_settings(CUSTOM_VALIDATORS={'dcim.site': [min_length_validator]})
     def test_min_length(self):
         with self.assertRaises(ValidationError):

netbox/utilities/tests/test_filters.py

@@ -340,9 +340,9 @@ class DynamicFilterLookupExpressionTest(TestCase):
     def setUpTestData(cls):
 
         providers = (
-            Provider(name='Provider 1', slug='provider-1', asn=65001),
+            Provider(name='Provider 1', slug='provider-1'),
-            Provider(name='Provider 2', slug='provider-2', asn=65101),
+            Provider(name='Provider 2', slug='provider-2'),
-            Provider(name='Provider 3', slug='provider-3', asn=65201),
+            Provider(name='Provider 3', slug='provider-3'),
         )
         Provider.objects.bulk_create(providers)
 
@@ -454,22 +454,6 @@ class DynamicFilterLookupExpressionTest(TestCase):
         params = {'slug__niew': ['-1']}
         self.assertEqual(SiteFilterSet(params, Site.objects.all()).qs.count(), 2)
 
-    def test_provider_asn_lt(self):
-        params = {'asn__lt': [65101]}
-        self.assertEqual(ProviderFilterSet(params, Provider.objects.all()).qs.count(), 1)
-
-    def test_provider_asn_lte(self):
-        params = {'asn__lte': [65101]}
-        self.assertEqual(ProviderFilterSet(params, Provider.objects.all()).qs.count(), 2)
-
-    def test_provider_asn_gt(self):
-        params = {'asn__lt': [65101]}
-        self.assertEqual(ProviderFilterSet(params, Provider.objects.all()).qs.count(), 1)
-
-    def test_provider_asn_gte(self):
-        params = {'asn__gte': [65101]}
-        self.assertEqual(ProviderFilterSet(params, Provider.objects.all()).qs.count(), 2)
-
     def test_site_region_negation(self):
         params = {'region__n': ['region-1']}
         self.assertEqual(SiteFilterSet(params, Site.objects.all()).qs.count(), 2)