From c1eea166c9ed76dfafdce87feefd1857ea3ae5dc Mon Sep 17 00:00:00 2001 From: Jonathan Senecal Date: Wed, 10 Jun 2020 22:58:52 -0400 Subject: [PATCH] Fix tests for LabeledComponentForm * Added docstring * Removed redundant tests since refactoration --- netbox/dcim/tests/test_forms.py | 34 ++++----------------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/netbox/dcim/tests/test_forms.py b/netbox/dcim/tests/test_forms.py index 1fc18c3d3..aadc2cbfc 100644 --- a/netbox/dcim/tests/test_forms.py +++ b/netbox/dcim/tests/test_forms.py @@ -135,23 +135,22 @@ class LabelTestCase(TestCase): ) 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, 'name_pattern': 'eth[0-9]', - # Test that a label CAN be applied to each generated interfaces 'label_pattern': 'Interface[0-9]', 'type': InterfaceTypeChoices.TYPE_100ME_FIXED, } - form = InterfaceCreateForm(good_interface_data) + form = InterfaceCreateForm(interface_data) - print(form.errors) self.assertTrue(form.is_valid()) 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 = { 'device': self.device.pk, 'name_pattern': 'eth[0-9]', - # Test that a label CANNOT be applied to each generated interfaces 'label_pattern': 'Interface[0-1]', 'type': InterfaceTypeChoices.TYPE_100ME_FIXED, } @@ -159,28 +158,3 @@ class LabelTestCase(TestCase): self.assertFalse(form.is_valid()) 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)