diff options
author | Trent Nelson <trent@trent.me> | 2012-10-18 05:35:32 (GMT) |
---|---|---|
committer | Trent Nelson <trent@trent.me> | 2012-10-18 05:35:32 (GMT) |
commit | 6a7f8670dd4da9a8c9a7d9b460eb147abf87a61a (patch) | |
tree | 6872ce3c28fe0883570295bb7680ba1287e6c9f5 | |
parent | 34562e115b8e6069a7dae3a819226034a21f3141 (diff) | |
download | cpython-6a7f8670dd4da9a8c9a7d9b460eb147abf87a61a.zip cpython-6a7f8670dd4da9a8c9a7d9b460eb147abf87a61a.tar.gz cpython-6a7f8670dd4da9a8c9a7d9b460eb147abf87a61a.tar.bz2 |
Issue #16257: make test_create_connection() handle ENETUNREACH.
-rw-r--r-- | Lib/test/test_socket.py | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 13d0eb4..7d8b33a 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1197,7 +1197,26 @@ class NetworkConnectionNoServer(unittest.TestCase): port = test_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 |