Merged revisions 76840 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76840 | r.david.murray | 2009-12-14 16:57:39 -0500 (Mon, 14 Dec 2009) | 3 lines

  Issue #7498: make test_multiprocessing use test_support.find_unused_port
  instead of a hard coded port number in test_rapid_restart.
........

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index eba02a9aa1123639f2fa4517f6a719b6cf6e6fe8..66b2a2fff31b0a5edc7630021be9a7fa0bda558d 100644 (file)
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1213,8 +1213,9 @@ class _TestManagerRestart(BaseTestCase):
 
     def test_rapid_restart(self):
         authkey = os.urandom(32)
+        port = test.support.find_unused_port()
         manager = QueueManager(
-            address=('localhost', 9999), authkey=authkey, serializer=SERIALIZER)
+            address=('localhost', port), authkey=authkey, serializer=SERIALIZER)
         manager.start()
 
         p = self.Process(target=self._putter, args=(manager.address, authkey))
@@ -1224,7 +1225,7 @@ class _TestManagerRestart(BaseTestCase):
         del queue
         manager.shutdown()
         manager = QueueManager(
-            address=('localhost', 9999), authkey=authkey, serializer=SERIALIZER)
+            address=('localhost', port), authkey=authkey, serializer=SERIALIZER)
         manager.start()
         manager.shutdown()
 

diff --git a/Misc/NEWS b/Misc/NEWS
index e4c13a381d65f9b59e795645176a6ddd7c4fcd85..7b010c164d236dbd5d5e4d1fc0f468b770958572 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -508,6 +508,9 @@ Documentation
 Tests
 -----
 
+- Issue #7498: test_multiprocessing now uses test_support.find_unused_port
+  instead of a hardcoded port number in test_rapid_restart.
+
 - Issue #7431: use TESTFN in test_linecache instead of trying to create a 
   file in the Lib/test directory, which might be read-only for the
   user running the tests.