summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-11-02 16:53:06 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-11-02 16:53:06 (GMT)
commit0aade6258c424799282f5ff82d5997a008168b35 (patch)
tree95b45e0b804fd1408fe4f4748344f91d6248eeb7
parent9788497e4b5ea642784b8c9628257a6ba4498cf1 (diff)
parentb8ec1e35a94d25649bc934cb0c00557699b5d702 (diff)
downloadcpython-0aade6258c424799282f5ff82d5997a008168b35.zip
cpython-0aade6258c424799282f5ff82d5997a008168b35.tar.gz
cpython-0aade6258c424799282f5ff82d5997a008168b35.tar.bz2
Merge heads
-rw-r--r--Lib/test/test_multiprocessing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index d6e530d..86cf5c1 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -716,7 +716,7 @@ class _TestQueue(BaseTestCase):
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)
#
#