[Python-checkins] cpython (merge 3.3 -> default): Issue #16463: Fix a transient test_timeout failure.
charles-francois.natali
python-checkins at python.org
Fri Aug 16 23:22:18 CEST 2013
http://hg.python.org/cpython/rev/5d4fe1da2c90
changeset: 85207:5d4fe1da2c90
parent: 85205:3acbd7aca856
parent: 85206:5880c7d33e13
user: Charles-François Natali <cf.natali at gmail.com>
date: Fri Aug 16 23:19:56 2013 +0200
summary:
Issue #16463: Fix a transient test_timeout failure.
files:
Lib/test/test_timeout.py | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -1,5 +1,6 @@
"""Unit tests for socket timeout feature."""
+import functools
import unittest
from test import support
@@ -11,6 +12,18 @@
import socket
+ at functools.lru_cache()
+def resolve_address(host, port):
+ """Resolve an (host, port) to an address.
+
+ We must perform name resolution before timeout tests, otherwise it will be
+ performed by connect().
+ """
+ with support.transient_internet(host):
+ return socket.getaddrinfo(host, port, socket.AF_INET,
+ socket.SOCK_STREAM)[0][4]
+
+
class CreationTestCase(unittest.TestCase):
"""Test case for socket.gettimeout() and socket.settimeout()"""
@@ -132,7 +145,7 @@
def setUp(self):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- self.addr_remote = ('www.python.org.', 80)
+ self.addr_remote = resolve_address('www.python.org.', 80)
def tearDown(self):
self.sock.close()
@@ -142,7 +155,7 @@
# to a host that silently drops our packets. We can't simulate this
# from Python because it's a function of the underlying TCP/IP stack.
# So, the following Snakebite host has been defined:
- blackhole = ('blackhole.snakebite.net', 56666)
+ blackhole = resolve_address('blackhole.snakebite.net', 56666)
# Blackhole has been configured to silently drop any incoming packets.
# No RSTs (for TCP) or ICMP UNREACH (for UDP/ICMP) will be sent back
@@ -154,7 +167,7 @@
# to firewalling or general network configuration. In order to improve
# our confidence in testing the blackhole, a corresponding 'whitehole'
# has also been set up using one port higher:
- whitehole = ('whitehole.snakebite.net', 56667)
+ whitehole = resolve_address('whitehole.snakebite.net', 56667)
# This address has been configured to immediately drop any incoming
# packets as well, but it does it respectfully with regards to the
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list