diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-07-16 02:10:44 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-07-16 02:10:44 (GMT) |
| commit | 7dc35f6fea054f9e7488e3d06d4dfdaac86af310 (patch) | |
| tree | 5bd23d03a1ff5abc6b1f506391b2a55c53671c76 /Lib/test/test_concurrent_futures.py | |
| parent | 0bd152cd67fef5c238ed15ba2ce09f6a74e8d334 (diff) | |
| parent | dc19c24832fac20402f6cf4d2396c299a73766bb (diff) | |
| download | cpython-7dc35f6fea054f9e7488e3d06d4dfdaac86af310.zip cpython-7dc35f6fea054f9e7488e3d06d4dfdaac86af310.tar.gz cpython-7dc35f6fea054f9e7488e3d06d4dfdaac86af310.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/test/test_concurrent_futures.py')
| -rw-r--r-- | Lib/test/test_concurrent_futures.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index 222bd54..78a9906 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -634,7 +634,8 @@ def test_main(): ThreadPoolAsCompletedTests, FutureTests, ProcessPoolShutdownTest, - ThreadPoolShutdownTest) + ThreadPoolShutdownTest, + ) finally: test.support.reap_children() |