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.
........

diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index e8e2a6f18fa42d7387352e10544a84b8c00e2b62..b67cbc92f213bf9585f011d6f493767058712f96 100644 (file)
--- 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)

diff --git a/Misc/NEWS b/Misc/NEWS
index fe7e6f6ad0c6aecbc0dd1355a7c29bc3812d776d..db66f3dd528e8c33d66ebac031743b3bb2d4d717 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.