From f7a8e9cf051e4ab9412f276596428fe414ac0ce6 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 28 Aug 2012 00:24:52 +0200 Subject: Issue #15781: Fix two small race conditions in import's module locking. --- Lib/test/test_threaded_import.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Lib/test/test_threaded_import.py') diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py index f540bdc67c..cfc6842e1f 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() -- cgit v1.2.1