diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2013-11-17 17:47:00 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2013-11-17 17:47:00 (GMT) |
| commit | 35e4ad71baae5469ee678718bac0f9caf7fae740 (patch) | |
| tree | 1760cc4decf2a98c3e4b7dfb5b81c34a5134b395 | |
| parent | 69cce482cb9e62341dcc3c72515f43bdca762b7b (diff) | |
| parent | 46b4a5e51e632899e268a39330374f20af50a056 (diff) | |
| download | cpython-35e4ad71baae5469ee678718bac0f9caf7fae740.zip cpython-35e4ad71baae5469ee678718bac0f9caf7fae740.tar.gz cpython-35e4ad71baae5469ee678718bac0f9caf7fae740.tar.bz2 | |
Merge.
| -rw-r--r-- | 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 index 183e86f..bd26e3d 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -1721,7 +1721,7 @@ class _TestPool(BaseTestCase): 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) |