diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-03-24 15:39:07 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-03-24 15:39:07 (GMT) |
| commit | 900189b41457d9d4bd0ddffc08f089eab73ec63a (patch) | |
| tree | 00f1e6fbb757a4519ad40a9b2a1476e1b00c909e | |
| parent | aebac0b55a1e3addb93ec7992046a4f9561b4175 (diff) | |
| parent | 29943aa120adf77407504ca6421bd13af922c93e (diff) | |
| download | cpython-900189b41457d9d4bd0ddffc08f089eab73ec63a.zip cpython-900189b41457d9d4bd0ddffc08f089eab73ec63a.tar.gz cpython-900189b41457d9d4bd0ddffc08f089eab73ec63a.tar.bz2 | |
Merge 3.1
| -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 644145f..55b8cdd 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1088,7 +1088,7 @@ class _TestPool(BaseTestCase): self.pool.terminate() join = TimingWrapper(self.pool.join) join() - self.assertTrue(join.elapsed < 0.5) + self.assertLess(join.elapsed, 0.5) def raising(): raise KeyError("key") |