| commit | f09e652a0e2d71696e0163565bcb4cc6020e4775 | [log] [tgz] |
|---|---|---|
| author | Victor Stinner <victor.stinner@haypocalc.com> | Thu Mar 24 16:39:34 2011 +0100 |
| committer | Victor Stinner <victor.stinner@haypocalc.com> | Thu Mar 24 16:39:34 2011 +0100 |
| tree | e22d9c265330cbcc359874b00a295d3da2f208f1 | |
| parent | bace3b9ac65b87d6ad8bfc7240d3dc70deb01f90 [diff] | |
| parent | 900189b41457d9d4bd0ddffc08f089eab73ec63a [diff] |
Merge 3.2
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index 8a33f5e..06449d2 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py
@@ -1100,7 +1100,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")