Issue #20605: Make test_socket getaddrinfo OS X segfault test more robust.
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 67ff1be..450aee1 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1164,9 +1164,15 @@
# Issue #6697.
self.assertRaises(UnicodeEncodeError, socket.getaddrinfo, 'localhost', '\uD800')
- # Issue 17269
+ # Issue 17269: test workaround for OS X platform bug segfault
if hasattr(socket, 'AI_NUMERICSERV'):
- socket.getaddrinfo("localhost", None, 0, 0, 0, socket.AI_NUMERICSERV)
+ try:
+ # The arguments here are undefined and the call may succeed
+ # or fail. All we care here is that it doesn't segfault.
+ socket.getaddrinfo("localhost", None, 0, 0, 0,
+ socket.AI_NUMERICSERV)
+ except socket.gaierror:
+ pass
def test_getnameinfo(self):
# only IP addresses are allowed
diff --git a/Misc/NEWS b/Misc/NEWS
index e5157cf..b226072 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -116,6 +116,8 @@
- Issue #20474: Fix test_socket "unexpected success" failures on OS X 10.7+.
+- Issue #20605: Make test_socket getaddrinfo OS X segfault test more robust.
+
Documentation
-------------