Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
7c389e24
Commit
7c389e24
authored
Feb 08, 2014
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #20553. Use specific asserts in ipaddress tests.
parent
a7c07d32
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
18 deletions
+17
-18
Lib/test/test_ipaddress.py
Lib/test/test_ipaddress.py
+17
-18
No files found.
Lib/test/test_ipaddress.py
View file @
7c389e24
...
...
@@ -921,13 +921,13 @@ class IpaddrUnitTest(unittest.TestCase):
36893488147419103232
)
def
testContains
(
self
):
self
.
assert
True
(
ipaddress
.
IPv4Interface
(
'1.2.3.128/25'
)
in
self
.
ipv4_network
)
self
.
assert
False
(
ipaddress
.
IPv4Interface
(
'1.2.4.1/24'
)
in
self
.
assert
In
(
ipaddress
.
IPv4Interface
(
'1.2.3.128/25'
),
self
.
ipv4_network
)
self
.
assert
NotIn
(
ipaddress
.
IPv4Interface
(
'1.2.4.1/24'
),
self
.
ipv4_network
)
# We can test addresses and string as well.
addr1
=
ipaddress
.
IPv4Address
(
'1.2.3.37'
)
self
.
assert
True
(
addr1
in
self
.
ipv4_network
)
self
.
assert
In
(
addr1
,
self
.
ipv4_network
)
# issue 61, bad network comparison on like-ip'd network objects
# with identical broadcast addresses.
self
.
assertFalse
(
ipaddress
.
IPv4Network
(
'1.1.0.0/16'
).
__contains__
(
...
...
@@ -1500,8 +1500,8 @@ class IpaddrUnitTest(unittest.TestCase):
dummy
[
self
.
ipv6_address
]
=
None
dummy
[
ip1
]
=
None
dummy
[
ip2
]
=
None
self
.
assert
True
(
self
.
ipv4_address
in
dummy
)
self
.
assert
True
(
ip2
in
dummy
)
self
.
assert
In
(
self
.
ipv4_address
,
dummy
)
self
.
assert
In
(
ip2
,
dummy
)
def
testIPBases
(
self
):
net
=
self
.
ipv4_network
...
...
@@ -1608,9 +1608,9 @@ class IpaddrUnitTest(unittest.TestCase):
def
testNetworkElementCaching
(
self
):
# V4 - make sure we're empty
self
.
assert
False
(
'network_address'
in
self
.
ipv4_network
.
_cache
)
self
.
assert
False
(
'broadcast_address'
in
self
.
ipv4_network
.
_cache
)
self
.
assert
False
(
'hostmask'
in
self
.
ipv4_network
.
_cache
)
self
.
assert
NotIn
(
'network_address'
,
self
.
ipv4_network
.
_cache
)
self
.
assert
NotIn
(
'broadcast_address'
,
self
.
ipv4_network
.
_cache
)
self
.
assert
NotIn
(
'hostmask'
,
self
.
ipv4_network
.
_cache
)
# V4 - populate and test
self
.
assertEqual
(
self
.
ipv4_network
.
network_address
,
...
...
@@ -1621,12 +1621,12 @@ class IpaddrUnitTest(unittest.TestCase):
ipaddress
.
IPv4Address
(
'0.0.0.255'
))
# V4 - check we're cached
self
.
assert
True
(
'broadcast_address'
in
self
.
ipv4_network
.
_cache
)
self
.
assert
True
(
'hostmask'
in
self
.
ipv4_network
.
_cache
)
self
.
assert
In
(
'broadcast_address'
,
self
.
ipv4_network
.
_cache
)
self
.
assert
In
(
'hostmask'
,
self
.
ipv4_network
.
_cache
)
# V6 - make sure we're empty
self
.
assert
False
(
'broadcast_address'
in
self
.
ipv6_network
.
_cache
)
self
.
assert
False
(
'hostmask'
in
self
.
ipv6_network
.
_cache
)
self
.
assert
NotIn
(
'broadcast_address'
,
self
.
ipv6_network
.
_cache
)
self
.
assert
NotIn
(
'hostmask'
,
self
.
ipv6_network
.
_cache
)
# V6 - populate and test
self
.
assertEqual
(
self
.
ipv6_network
.
network_address
,
...
...
@@ -1646,11 +1646,10 @@ class IpaddrUnitTest(unittest.TestCase):
ipaddress
.
IPv6Address
(
'::ffff:ffff:ffff:ffff'
))
# V6 - check we're cached
self
.
assertTrue
(
'broadcast_address'
in
self
.
ipv6_network
.
_cache
)
self
.
assertTrue
(
'hostmask'
in
self
.
ipv6_network
.
_cache
)
self
.
assertTrue
(
'broadcast_address'
in
self
.
ipv6_interface
.
network
.
_cache
)
self
.
assertTrue
(
'hostmask'
in
self
.
ipv6_interface
.
network
.
_cache
)
self
.
assertIn
(
'broadcast_address'
,
self
.
ipv6_network
.
_cache
)
self
.
assertIn
(
'hostmask'
,
self
.
ipv6_network
.
_cache
)
self
.
assertIn
(
'broadcast_address'
,
self
.
ipv6_interface
.
network
.
_cache
)
self
.
assertIn
(
'hostmask'
,
self
.
ipv6_interface
.
network
.
_cache
)
def
testTeredo
(
self
):
# stolen from wikipedia
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment