traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 78016 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78016 | r.david.murray | 2010-02-06 00:00:15 -0500 (Sat, 06 Feb 2010) | 11 lines

  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.
  ........
................
This commit is contained in:
R. David Murray 2010-02-06 05:09:09 +00:00
parent a1bd445e6c
commit f35c87631d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_timeout.py
View File

@ -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)

3
Misc/NEWS
View File

@ -301,6 +301,9 @@ Extension Modules
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.