Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #26936: Fix the test_socket failures on Android - getservbyname(), 

getservbyport() and getaddrinfo() are broken on some Android API levels.
This commit is contained in:
Xavier de Gaye 2016-12-13 09:22:01 +01:00
parent 5831d7d558
commit d0c2b5b0ae
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_socket.py
View File

@ -932,8 +932,11 @@ class GeneralModuleTests(unittest.TestCase):
else: else:
raise OSError raise OSError
# Try same call with optional protocol omitted # Try same call with optional protocol omitted
port2 = socket.getservbyname(service) # Issue #26936: Android getservbyname() was broken before API 23.
eq(port, port2) if (not hasattr(sys, 'getandroidapilevel') or
sys.getandroidapilevel() >= 23):
port2 = socket.getservbyname(service)
eq(port, port2)
# Try udp, but don't barf if it doesn't exist # Try udp, but don't barf if it doesn't exist
try: try:
udpport = socket.getservbyname(service, 'udp') udpport = socket.getservbyname(service, 'udp')
@ -942,7 +945,9 @@ class GeneralModuleTests(unittest.TestCase):
else: else:
eq(udpport, port) eq(udpport, port)
# Now make sure the lookup by port returns the same service name # Now make sure the lookup by port returns the same service name
eq(socket.getservbyport(port2), service) # Issue #26936: Android getservbyport() is broken.
if not support.is_android:
eq(socket.getservbyport(port2), service)
eq(socket.getservbyport(port, 'tcp'), service) eq(socket.getservbyport(port, 'tcp'), service)
if udpport is not None: if udpport is not None:
eq(socket.getservbyport(udpport, 'udp'), service) eq(socket.getservbyport(udpport, 'udp'), service)
@ -1275,7 +1280,10 @@ class GeneralModuleTests(unittest.TestCase):
socket.getaddrinfo('::1', 80) socket.getaddrinfo('::1', 80)
# port can be a string service name such as "http", a numeric # port can be a string service name such as "http", a numeric
# port number or None # port number or None
socket.getaddrinfo(HOST, "http") # Issue #26936: Android getaddrinfo() was broken before API level 23.
if (not hasattr(sys, 'getandroidapilevel') or
sys.getandroidapilevel() >= 23):
socket.getaddrinfo(HOST, "http")
socket.getaddrinfo(HOST, 80) socket.getaddrinfo(HOST, 80)
socket.getaddrinfo(HOST, None) socket.getaddrinfo(HOST, None)
# test family and socktype filters # test family and socktype filters

3
Misc/NEWS
View File

@ -588,6 +588,9 @@ Tools/Demos
Tests Tests
----- -----
- Issue #26936: Fix the test_socket failures on Android - getservbyname(),
getservbyport() and getaddrinfo() are broken on some Android API levels.
- Issue #28666: Now test.support.rmtree is able to remove unwritable or - Issue #28666: Now test.support.rmtree is able to remove unwritable or
unreadable directories. unreadable directories.