summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-11-02 16:47:08 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2013-11-02 16:47:08 (GMT)
commitaf630c5885c838dfb73a5d7ee11efc3dc9245584 (patch)
treed173f7d5184dac3bde8d6b2a66a2d0a0f65535b4 /Lib
parent2902b6d17a7596d5b0552717c46033fd98c6566c (diff)
parentb8ec1e35a94d25649bc934cb0c00557699b5d702 (diff)
downloadcpython-af630c5885c838dfb73a5d7ee11efc3dc9245584.zip
cpython-af630c5885c838dfb73a5d7ee11efc3dc9245584.tar.gz
cpython-af630c5885c838dfb73a5d7ee11efc3dc9245584.tar.bz2
Merge.
Diffstat (limited to 'Lib')
-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 f12a5f9..ad77260 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -723,7 +723,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)
#
#