summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_threaded_import.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-08-27 22:24:52 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-08-27 22:24:52 (GMT)
commit0398985920dcad1fcff0859e18a5911a6c685ff1 (patch)
treede0d47e15582579bb02517e08759d9bba3619890 /Lib/test/test_threaded_import.py
parent30147710e8d6b2b5aebcf6f774fe289a4918958c (diff)
downloadcpython-0398985920dcad1fcff0859e18a5911a6c685ff1.zip
cpython-0398985920dcad1fcff0859e18a5911a6c685ff1.tar.gz
cpython-0398985920dcad1fcff0859e18a5911a6c685ff1.tar.bz2
Issue #15781: Fix two small race conditions in import's module locking.
Diffstat (limited to 'Lib/test/test_threaded_import.py')
-rw-r--r--Lib/test/test_threaded_import.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index f540bdc..cfc6842 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -224,7 +224,17 @@ class ThreadedImportTests(unittest.TestCase):
@reap_threads
def test_main():
- run_unittest(ThreadedImportTests)
+ old_switchinterval = None
+ try:
+ old_switchinterval = sys.getswitchinterval()
+ sys.setswitchinterval(0.00000001)
+ except AttributeError:
+ pass
+ try:
+ run_unittest(ThreadedImportTests)
+ finally:
+ if old_switchinterval is not None:
+ sys.setswitchinterval(old_switchinterval)
if __name__ == "__main__":
test_main()