commit 35db513187a6150978f6a7355d3bd42f1a8b54e5
author Hynek Schlawack <hs@ox.cx> Fri Jun 01 20:12:17 2012 +0200
committer Hynek Schlawack <hs@ox.cx> Fri Jun 01 20:12:17 2012 +0200
tree 42ba69527f8e7b44fde9e0d8ab4f02b3f48b283f
parent d1ab6089ff2b4f1277676a5feac11d311b2c52ab

#14814: Fix errror message creation in ipaddress.collapse_addresses

Lib/test/test_ipaddress.py

diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
index fd6c38c..aff4ff9 100644
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -596,10 +596,17 @@
         self.assertEqual(list(collapsed), [ip3])
 
         # the toejam test
-        ip1 = ipaddress.ip_address('1.1.1.1')
-        ip2 = ipaddress.ip_address('::1')
-        self.assertRaises(TypeError, ipaddress.collapse_addresses,
-                          [ip1, ip2])
+        addr_tuples = [
+                (ipaddress.ip_address('1.1.1.1'),
+                 ipaddress.ip_address('::1')),
+                (ipaddress.IPv4Network('1.1.0.0/24'),
+                 ipaddress.IPv6Network('2001::/120')),
+                (ipaddress.IPv4Network('1.1.0.0/32'),
+                 ipaddress.IPv6Network('2001::/128')),
+        ]
+        for ip1, ip2 in addr_tuples:
+            self.assertRaises(TypeError, ipaddress.collapse_addresses,
+                              [ip1, ip2])
 
     def testSummarizing(self):
         #ip = ipaddress.ip_address