| commit | 900189b41457d9d4bd0ddffc08f089eab73ec63a | [log] [tgz] |
|---|---|---|
| author | Victor Stinner <victor.stinner@haypocalc.com> | Thu Mar 24 16:39:07 2011 +0100 |
| committer | Victor Stinner <victor.stinner@haypocalc.com> | Thu Mar 24 16:39:07 2011 +0100 |
| tree | 00f1e6fbb757a4519ad40a9b2a1476e1b00c909e | |
| parent | aebac0b55a1e3addb93ec7992046a4f9561b4175 [diff] | |
| parent | 29943aa120adf77407504ca6421bd13af922c93e [diff] |
Merge 3.1
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 @@ 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")