diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-02-06 05:00:15 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-02-06 05:00:15 (GMT) |
| commit | e9e95938036d8f493ee52c17f9cec1ca7f4f4d27 (patch) | |
| tree | 01e44ede4e64f7cf321d9ef184d21277c395b031 | |
| parent | 41647d6dad0bcee398cdacb2901b0dd96f2ad08e (diff) | |
| download | cpython-e9e95938036d8f493ee52c17f9cec1ca7f4f4d27.zip cpython-e9e95938036d8f493ee52c17f9cec1ca7f4f4d27.tar.gz cpython-e9e95938036d8f493ee52c17f9cec1ca7f4f4d27.tar.bz2 | |
Merged revisions 78014 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78014 | r.david.murray | 2010-02-05 23:27:21 -0500 (Fri, 05 Feb 2010) | 5 lines
issue #7728: test_timeout was using a hardcoded port, which was
causing buildbot failures. Changed to use test_support.bind_port.
Patch by Florent Xicluna.
........
| -rw-r--r-- | Lib/test/test_timeout.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py index e8e2a6f..b67cbc9 100644 --- a/Lib/test/test_timeout.py +++ b/Lib/test/test_timeout.py @@ -101,7 +101,7 @@ class TimeoutTestCase(unittest.TestCase): def setUp(self): self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.addr_remote = ('www.python.org.', 80) - self.addr_local = ('127.0.0.1', 25339) + self.localhost = '127.0.0.1' def tearDown(self): self.sock.close() @@ -146,7 +146,8 @@ class TimeoutTestCase(unittest.TestCase): # Test accept() timeout _timeout = 2 self.sock.settimeout(_timeout) - self.sock.bind(self.addr_local) + # Prevent "Address already in use" socket exceptions + support.bind_port(self.sock, self.localhost) self.sock.listen(5) _t1 = time.time() @@ -163,7 +164,8 @@ class TimeoutTestCase(unittest.TestCase): _timeout = 2 self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.sock.settimeout(_timeout) - self.sock.bind(self.addr_local) + # Prevent "Address already in use" socket exceptions + support.bind_port(self.sock, self.localhost) _t1 = time.time() self.assertRaises(socket.error, self.sock.recvfrom, 8192) @@ -716,6 +716,9 @@ Documentation Tests ----- +- issue #7728: test_timeout was changed to use test_support.bind_port + instead of a hard coded port. + - Issue #7376: instead of running a self-test (which was failing) when called with no arguments, doctest.py now gives a usage message. |