Просмотр исходного кода

Fix tests for LabeledComponentForm
* Added docstring
* Removed redundant tests since refactoration

Jonathan Senecal 5 лет назад
Родитель
Сommit
c1eea166c9
1 измененных файлов с 4 добавлено и 30 удалено
  1. 4 30
      netbox/dcim/tests/test_forms.py

+ 4 - 30
netbox/dcim/tests/test_forms.py

@@ -135,23 +135,22 @@ class LabelTestCase(TestCase):
         )
         )
 
 
     def test_interface_label_count_valid(self):
     def test_interface_label_count_valid(self):
-        good_interface_data = {
+        """Test that a `label` can be generated for each generated `name` from `name_pattern` on InterfaceCreateForm"""
+        interface_data = {
             'device': self.device.pk,
             'device': self.device.pk,
             'name_pattern': 'eth[0-9]',
             'name_pattern': 'eth[0-9]',
-            # Test that a label CAN be applied to each generated interfaces
             'label_pattern': 'Interface[0-9]',
             'label_pattern': 'Interface[0-9]',
             'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
             'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
         }
         }
-        form = InterfaceCreateForm(good_interface_data)
+        form = InterfaceCreateForm(interface_data)
 
 
-        print(form.errors)
         self.assertTrue(form.is_valid())
         self.assertTrue(form.is_valid())
 
 
     def test_interface_label_count_mismatch(self):
     def test_interface_label_count_mismatch(self):
+        """Test that a `label` cannot be generated for each generated `name` from `name_pattern` due to invalid `label_pattern` on InterfaceCreateForm"""
         bad_interface_data = {
         bad_interface_data = {
             'device': self.device.pk,
             'device': self.device.pk,
             'name_pattern': 'eth[0-9]',
             'name_pattern': 'eth[0-9]',
-            # Test that a label CANNOT be applied to each generated interfaces
             'label_pattern': 'Interface[0-1]',
             'label_pattern': 'Interface[0-1]',
             'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
             'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
         }
         }
@@ -159,28 +158,3 @@ class LabelTestCase(TestCase):
 
 
         self.assertFalse(form.is_valid())
         self.assertFalse(form.is_valid())
         self.assertIn('label_pattern', form.errors)
         self.assertIn('label_pattern', form.errors)
-
-    def test_console_port_template_label_count_valid(self):
-        bad_console_port_template_data = {
-            'device_type': self.device_type,
-            'name_pattern': 'Console Port Template[4-6]',
-            # Test that a label CANNOT be applied to each generated console port templates
-            'label_pattern': 'Serial[4-6]',
-            'type': ConsolePortTypeChoices.TYPE_RJ45,
-        }
-        form = ConsolePortTemplateCreateForm(bad_console_port_template_data)
-
-        self.assertTrue(form.is_valid())
-
-    def test_console_port_template_label_count_mismatch(self):
-        bad_console_port_template_data = {
-            'device_type': self.device_type,
-            'name_pattern': 'Console Port Template[4-6]',
-            # Test that a label CANNOT be applied to each generated console port templates
-            'label_pattern': 'Serial[0-1]',
-            'type': ConsolePortTypeChoices.TYPE_RJ45,
-        }
-        form = ConsolePortTemplateCreateForm(bad_console_port_template_data)
-
-        self.assertFalse(form.is_valid())
-        self.assertIn('label_pattern', form.errors)