diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2009-06-02 05:29:37 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2009-06-02 05:29:37 (GMT) |
| commit | 181bdc63741087bb43e299b0d3fa60b732894c7a (patch) | |
| tree | 178d09f63215399752da46a5251f36c28dbeab1e /Lib/test/test_ipaddr.py | |
| parent | b7ffad5b2837a3730a560d476487c1e10461cf7b (diff) | |
| download | cpython-181bdc63741087bb43e299b0d3fa60b732894c7a.zip cpython-181bdc63741087bb43e299b0d3fa60b732894c7a.tar.gz cpython-181bdc63741087bb43e299b0d3fa60b732894c7a.tar.bz2 | |
Merged revisions 73135 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73135 | gregory.p.smith | 2009-06-01 22:25:34 -0700 (Mon, 01 Jun 2009) | 3 lines
Fixes issue6169: it was possible for two ipaddr network addresses to compare
as both < and > than eachother.
........
Diffstat (limited to 'Lib/test/test_ipaddr.py')
| -rwxr-xr-x | Lib/test/test_ipaddr.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/Lib/test/test_ipaddr.py b/Lib/test/test_ipaddr.py index d117154..d00d3d8 100755 --- a/Lib/test/test_ipaddr.py +++ b/Lib/test/test_ipaddr.py @@ -1,18 +1,6 @@ # Copyright 2007 Google Inc. # Licensed to PSF under a Contributor Agreement. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# # See also: http://code.google.com/p/ipaddr-py/ """Unittest for ipaddr module.""" @@ -393,6 +381,21 @@ class IpaddrUnitTest(unittest.TestCase): self.assertTrue(ipv6 > ipv4) self.assertTrue(ipv4 < ipv6) + # Regression test for issue6169 (ipaddr-py issue 19) + ip1 = ipaddr.IP('10.1.2.128/25') + self.assertFalse(ip1 < ip1) + self.assertFalse(ip1 > ip1) + ip2 = ipaddr.IP('10.1.3.0/24') + self.assertTrue(ip1 < ip2) + self.assertFalse(ip2 < ip1) + self.assertFalse(ip1 > ip2) + self.assertTrue(ip2 > ip1) + ip3 = ipaddr.IP('10.1.3.0/25') + self.assertTrue(ip2 < ip3) + self.assertFalse(ip3 < ip2) + self.assertFalse(ip2 > ip3) + self.assertTrue(ip3 > ip2) + def test_embedded_ipv4(self): ipv4_string = '192.168.0.1' ipv4 = ipaddr.IPv4(ipv4_string) |