diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-10-20 22:36:18 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-10-20 22:36:18 (GMT) |
| commit | ea8762cae64813788633b7d2a93c2c513c01fdea (patch) | |
| tree | 2afdb63d2adc9cf29fec4a7a4bb1dbffc9b654df /Lib/test/test_regrtest.py | |
| parent | dc5061fe10221fa7d83c4c7cd00f4f5fa2123dd0 (diff) | |
| parent | 56b2cf5e8564c7221a42675d35aaa0d0c503365e (diff) | |
| download | cpython-ea8762cae64813788633b7d2a93c2c513c01fdea.zip cpython-ea8762cae64813788633b7d2a93c2c513c01fdea.tar.gz cpython-ea8762cae64813788633b7d2a93c2c513c01fdea.tar.bz2 | |
Merge test suite fixes from 3.6
Diffstat (limited to 'Lib/test/test_regrtest.py')
| -rw-r--r-- | Lib/test/test_regrtest.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index d431604..52909d8 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -696,7 +696,12 @@ class ArgsTestCase(BaseTestCase): code = TEST_INTERRUPTED test = self.create_test("sigint", code=code) - for multiprocessing in (False, True): + try: + import threading + tests = (False, True) + except ImportError: + tests = (False,) + for multiprocessing in tests: if multiprocessing: args = ("--slowest", "-j2", test) else: |