diff options
| author | Peter Moody <pmoody@google.com> | 2011-02-08 01:56:52 +0000 |
|---|---|---|
| committer | Peter Moody <pmoody@google.com> | 2011-02-08 01:56:52 +0000 |
| commit | 6c49a8ad5687d11e9162648d546c90b309199fe6 (patch) | |
| tree | 0d28a919f147e5edba9505b5843f4dde825d0a36 /ipaddr_test.py | |
| parent | a03e20ccb1228b9791f224f2db714c38fc9728d0 (diff) | |
| download | ipaddr-py-6c49a8ad5687d11e9162648d546c90b309199fe6.tar.gz | |
+ fix broken network/address comparisons.
git-svn-id: https://ipaddr-py.googlecode.com/svn/trunk@206 09200d28-7f98-11dd-ad27-0f66e57d2035
Diffstat (limited to 'ipaddr_test.py')
| -rwxr-xr-x | ipaddr_test.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ipaddr_test.py b/ipaddr_test.py index b7be753..0fefb09 100755 --- a/ipaddr_test.py +++ b/ipaddr_test.py @@ -423,9 +423,17 @@ class IpaddrUnitTest(unittest.TestCase): self.assertFalse(self.ipv4 == '') self.assertFalse(self.ipv4 == []) self.assertFalse(self.ipv4 == 2) + self.assertTrue(ipaddr.IPNetwork('1.1.1.1/32') == + ipaddr.IPAddress('1.1.1.1')) + self.assertFalse(ipaddr.IPNetwork('1.1.1.1/24') == + ipaddr.IPAddress('1.1.1.1')) self.assertTrue(self.ipv6 == ipaddr.IPv6Network('2001:658:22a:cafe:200::1/64')) + self.assertTrue(ipaddr.IPNetwork('::1/128') == + ipaddr.IPAddress('::1')) + self.assertFalse(ipaddr.IPNetwork('::1/127') == + ipaddr.IPAddress('::1')) self.assertFalse(self.ipv6 == ipaddr.IPv6Network('2001:658:22a:cafe:200::1/63')) self.assertFalse(self.ipv6 == ipaddr.IPv4Network('1.2.3.4/23')) @@ -433,10 +441,10 @@ class IpaddrUnitTest(unittest.TestCase): self.assertFalse(self.ipv6 == []) self.assertFalse(self.ipv6 == 2) + + def testNotEquals(self): - addr1 = ipaddr.IPAddress('1.2.3.4') self.assertFalse(self.ipv4 != ipaddr.IPv4Network('1.2.3.4/24')) - self.assertFalse(self.ipv4 == addr1) self.assertTrue(self.ipv4 != ipaddr.IPv4Network('1.2.3.4/23')) self.assertTrue(self.ipv4 != ipaddr.IPv6Network('::1.2.3.4/24')) self.assertTrue(self.ipv4 != '') @@ -446,7 +454,6 @@ class IpaddrUnitTest(unittest.TestCase): addr2 = ipaddr.IPAddress('2001:658:22a:cafe:200::1') self.assertFalse(self.ipv6 != ipaddr.IPv6Network('2001:658:22a:cafe:200::1/64')) - self.assertFalse(self.ipv6 == addr2) self.assertTrue(self.ipv6 != ipaddr.IPv6Network('2001:658:22a:cafe:200::1/63')) self.assertTrue(self.ipv6 != ipaddr.IPv4Network('1.2.3.4/23')) |