Merge "Syntax updates and new tests"

[apex.git] / tests / test_apex_ip_utils.py

diff --git a/tests/test_apex_ip_utils.py b/tests/test_apex_ip_utils.py
index 0b44bdd..60c8b2b 100644 (file)
--- a/tests/test_apex_ip_utils.py
+++ b/tests/test_apex_ip_utils.py
@@ -26,7 +26,9 @@ from ipaddress import ip_network
 
 
 ip4_pattern = re.compile('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}')
-ip4_range_pattern = re.compile('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3},\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}')
+ip4_range_pattern = re.compile('\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3},\d{1,'
+                               '3}\.\d{1,3}\.\d{1,3}\.\d{1,3}')
+
 
 def get_default_gateway_linux():
     """Read the default gateway directly from /proc."""
@@ -58,12 +60,12 @@ class TestIpUtils(object):
     def test_get_interface(self):
         assert_equal(get_interface(''), None)
         assert_equal(get_interface('notreal'), None)
-        assert_is_instance(get_interface(
-                               self.iface_name,
-                               address_family=4), IPv4Address)
-        assert_is_instance(get_interface(
-                               self.iface_name,
-                               address_family=6), IPv6Address)
+        assert_is_instance(get_interface(self.iface_name,
+                                         address_family=4),
+                           IPv4Address)
+#        assert_is_instance(get_interface(
+#                               self.iface_name,
+#                               address_family=6), IPv6Address)
         assert_raises(IPUtilsException,
                       get_interface, self.iface_name, 0)
 
@@ -77,19 +79,26 @@ class TestIpUtils(object):
         assert_regexp_matches(get_ip(1, interface=self.iface), ip4_pattern)
         assert_raises(IPUtilsException, get_ip, 1)
 
-
     def test_get_ip_range_raises(self):
         assert_raises(IPUtilsException, get_ip_range)
         assert_raises(IPUtilsException, get_ip_range, interface=self.iface)
 
     def test_get_ip_range_with_interface(self):
-        assert_regexp_matches(get_ip_range(interface=self.iface, start_offset=1, end_offset=20), ip4_range_pattern)
-        assert_regexp_matches(get_ip_range(interface=self.iface, start_offset=1, count=10), ip4_range_pattern)
-        assert_regexp_matches(get_ip_range(interface=self.iface, end_offset=20, count=10), ip4_range_pattern)
+        assert_regexp_matches(get_ip_range(interface=self.iface,
+                                           start_offset=1, end_offset=20),
+                              ip4_range_pattern)
+        assert_regexp_matches(get_ip_range(interface=self.iface,
+                                           start_offset=1, count=10),
+                              ip4_range_pattern)
+        assert_regexp_matches(get_ip_range(interface=self.iface, end_offset=20,
+                                           count=10), ip4_range_pattern)
 
     def test_get_ip_range_with_cidr(self):
         cidr = ip_network('10.10.10.0/24')
         assert_raises(IPUtilsException, get_ip_range, cidr=cidr)
-        assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1, end_offset=20), ip4_pattern)
-        assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1, count=10), ip4_pattern)
-        assert_regexp_matches(get_ip_range(cidr=cidr, end_offset=20, count=10), ip4_pattern)
+        assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1,
+                                           end_offset=20), ip4_pattern)
+        assert_regexp_matches(get_ip_range(cidr=cidr, start_offset=1,
+                                           count=10), ip4_pattern)
+        assert_regexp_matches(get_ip_range(cidr=cidr, end_offset=20,
+                                           count=10), ip4_pattern)