[Python-checkins] cpython (merge 3.3 -> default): Merge.

[richard.oudkerk]

http://hg.python.org/cpython/rev/2ead6c9744c0
changeset:   87213:2ead6c9744c0
parent:      87210:9779267262d2
parent:      87212:7d6a9e7060c7
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Sun Nov 17 17:47:00 2013 +0000
summary:
  Merge.

files:
  Lib/test/_test_multiprocessing.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -1721,7 +1721,7 @@
         self.assertTimingAlmostEqual(get.elapsed, TIMEOUT1)
 
     def test_async_timeout(self):
-        res = self.pool.apply_async(sqr, (6, TIMEOUT2 + 0.2))
+        res = self.pool.apply_async(sqr, (6, TIMEOUT2 + 1.0))
         get = TimingWrapper(res.get)
         self.assertRaises(multiprocessing.TimeoutError, get, timeout=TIMEOUT2)
         self.assertTimingAlmostEqual(get.elapsed, TIMEOUT2)

-- 
Repository URL: http://hg.python.org/cpython