diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-06-13 18:23:57 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-06-13 18:23:57 (GMT) |
| commit | eba3633f345e79866e53d1acdce57858079a2358 (patch) | |
| tree | 123fec95f093cc47a456511e897341eb28b6c6d4 | |
| parent | a4d1e461a706e914f43b4d80a362b853964ad6de (diff) | |
| parent | bc7c96b9ea64f4af3cb342725ebdff2abe6058ea (diff) | |
| download | cpython-eba3633f345e79866e53d1acdce57858079a2358.zip cpython-eba3633f345e79866e53d1acdce57858079a2358.tar.gz cpython-eba3633f345e79866e53d1acdce57858079a2358.tar.bz2 | |
Merge with 3.4
| -rw-r--r-- | Lib/test/test_multiprocessing_main_handling.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_multiprocessing_main_handling.py b/Lib/test/test_multiprocessing_main_handling.py index 7ea8e78..bfd6737 100644 --- a/Lib/test/test_multiprocessing_main_handling.py +++ b/Lib/test/test_multiprocessing_main_handling.py @@ -1,4 +1,8 @@ # tests __main__ module handling in multiprocessing +from test import support +# Skip tests if _thread or _multiprocessing wasn't built. +support.import_module('_thread') +support.import_module('_multiprocessing') import importlib import importlib.machinery @@ -9,14 +13,11 @@ import os import os.path import py_compile -from test import support from test.script_helper import ( make_pkg, make_script, make_zip_pkg, make_zip_script, assert_python_ok, assert_python_failure, temp_dir, spawn_python, kill_python) -# Skip tests if _multiprocessing wasn't built. -_multiprocessing = support.import_module('_multiprocessing') # Look up which start methods are available to test import multiprocessing AVAILABLE_START_METHODS = set(multiprocessing.get_all_start_methods()) |