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

[serhiy.storchaka]

http://hg.python.org/cpython/rev/576ffbaa6363
changeset:   86856:576ffbaa6363
branch:      3.3
parent:      86853:f25679db52fb
parent:      86851:f70142e3799b
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Nov 02 18:53:06 2013 +0200
summary:
  Merge heads

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
@@ -716,7 +716,7 @@
         start = time.time()
         self.assertRaises(pyqueue.Empty, q.get, True, 0.2)
         delta = time.time() - start
-        self.assertGreaterEqual(delta, 0.19)
+        self.assertGreaterEqual(delta, 0.18)
 
 #
 #

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