From 45bb613e25a34eca3c286ee668821f3ca1859a0b Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Wed, 17 Oct 2012 06:15:15 -0400 Subject: [PATCH] Issue #16257: make test_create_connection() handle ENETUNREACH. --- Lib/test/test_socket.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index e2ed21d222b..e40b21e83cb 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1638,7 +1638,26 @@ class NetworkConnectionNoServer(unittest.TestCase): port = support.find_unused_port() with self.assertRaises(socket.error) as cm: socket.create_connection((HOST, port)) - self.assertEqual(cm.exception.errno, errno.ECONNREFUSED) + + # Issue #16257: create_connection() calls getaddrinfo() against + # 'localhost'. This may result in an IPV6 addr being returned + # as well as an IPV4 one: + # >>> socket.getaddrinfo('localhost', port, 0, SOCK_STREAM) + # >>> [(2, 2, 0, '', ('127.0.0.1', 41230)), + # (26, 2, 0, '', ('::1', 41230, 0, 0))] + # + # create_connection() enumerates through all the addresses returned + # and if it doesn't successfully bind to any of them, it propagates + # the last exception it encountered. + # + # On Solaris, ENETUNREACH is returned in this circumstance instead + # of ECONNREFUSED. So, if that errno exists, add it to our list of + # expected errnos. + expected_errnos = [ errno.ECONNREFUSED, ] + if hasattr(errno, 'ENETUNREACH'): + expected_errnos.append(errno.ENETUNREACH) + + self.assertIn(cm.exception.errno, expected_errnos) def test_create_connection_timeout(self): # Issue #9792: create_connection() should not recast timeout errors