diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-10-01 21:44:00 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-10-01 21:44:00 (GMT) |
| commit | 77cddc316477b002453f4b9e95278b93b3cb3070 (patch) | |
| tree | c1f0efad76cddedbaf41c2234fe1fbf8d7cb617d /Lib/test | |
| parent | c19488498354cedfec8d4ad3884292d4a5594641 (diff) | |
| parent | 219c7b90d0d2e1eda3a76e2d777240c005c658cb (diff) | |
| download | cpython-77cddc316477b002453f4b9e95278b93b3cb3070.zip cpython-77cddc316477b002453f4b9e95278b93b3cb3070.tar.gz cpython-77cddc316477b002453f4b9e95278b93b3cb3070.tar.bz2 | |
Merge
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_threaded_import.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py index 4a5d7be..0528b13 100644 --- a/Lib/test/test_threaded_import.py +++ b/Lib/test/test_threaded_import.py @@ -225,11 +225,9 @@ class ThreadedImportTests(unittest.TestCase): @reap_threads def test_main(): old_switchinterval = None - # Issue #15599: FreeBSD/KVM cannot handle gil_interval == 1. - new_switchinterval = 0.00001 if 'freebsd' in sys.platform else 0.00000001 try: old_switchinterval = sys.getswitchinterval() - sys.setswitchinterval(new_switchinterval) + sys.setswitchinterval(1e-5) except AttributeError: pass try: |