From 8e9a0eeef00a9c2c76d9fce99969a040e73c1c15 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Fri, 31 Jan 2020 10:05:57 -0600 Subject: [PATCH] Fix PEP8 errors and document functions --- netbox/ipam/tests/test_ordering.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/netbox/ipam/tests/test_ordering.py b/netbox/ipam/tests/test_ordering.py index 6b2d6ad08..6818df399 100644 --- a/netbox/ipam/tests/test_ordering.py +++ b/netbox/ipam/tests/test_ordering.py @@ -16,6 +16,7 @@ class PrefixOrderingTestCase(TestCase): VRF.objects.bulk_create([vrfa, vrfb, vrfc]) self.vrfs = (vrfa, vrfb, vrfc) + # Function to create all prefixes def _create_prefix(self, prefixes): prefixobjects = [] for pfx in prefixes: @@ -28,22 +29,26 @@ class PrefixOrderingTestCase(TestCase): return prefixobjects + # Prefix Comparison function def _compare_prefix(self, queryset, prefixes): - + # Loop and compare each prefix for i, obj in enumerate(queryset): status, vrf, prefix = prefixes[i] self.assertEqual((obj.vrf, obj.prefix), (vrf, prefix)) + # Complex prefix comparison function def _compare_complex(self, queryset, prefixes): qsprefixes, regprefixes = [], [] + # Loop and build list of queryset prefixes to compare for i, obj in enumerate(queryset): qsprefixes.append(obj.prefix) + # Loop and build list of prefixes to compare for pfx in prefixes: regprefixes.append(pfx[2]) + + # Return two lists as a tuple return (qsprefixes, regprefixes) - - def test_prefix_ordering(self): # Setup Prefixes prefixes = ( @@ -176,8 +181,10 @@ class IPAddressOrderingTestCase(TestCase): VRF.objects.bulk_create([vrfa, vrfb, vrfc]) self.vrfs = (vrfa, vrfb, vrfc) + # Function to build all addresses def _create_address(self, addresses): addressobjects = [] + # Loop and build IPAddress object for addr in addresses: status, vrf, address = addr family = 4 @@ -188,13 +195,13 @@ class IPAddressOrderingTestCase(TestCase): return addressobjects + # Function to compare all addresses def _compare_address(self, queryset, addresses): - + # Loop and compare addresses for i, obj in enumerate(queryset): status, vrf, address = addresses[i] self.assertEqual((obj.vrf, obj.address), (vrf, address)) - def test_address_ordering(self): # Setup Addresses addresses = (