| commit | 620626b1605b750790b66c701c754bf32cdb56dc | [log] [tgz] |
|---|---|---|
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | Thu Jun 19 22:03:50 2008 +0000 |
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | Thu Jun 19 22:03:50 2008 +0000 |
| tree | 21b7d79cd13cb9d37654115a1e2d6a311d015e7c | |
| parent | 9196dc66ae57a7cb751a42d49e5ab6038c916ff7 [diff] [blame] |
merge error: test.test_support is now test.support
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index 95c5c73..5522c07 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py
@@ -1759,7 +1759,7 @@ try: lock = multiprocessing.RLock() except OSError: - from test.test_support import TestSkipped + from test.support import TestSkipped raise TestSkipped("OSError raises on RLock creation, see issue 3111!") if run is None: