summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_threaded_import.py
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2002-02-16 07:26:27 (GMT)
committerTim Peters <tim.peters@gmail.com>2002-02-16 07:26:27 (GMT)
commit20882dd1742310c8cf6858354ecb150810adb95c (patch)
treea5f09339b4f43cbdf9464e9586dcdac65bf19a0d /Lib/test/test_threaded_import.py
parente73ad2a21f997f0d18195207972fb31a09b0b1c1 (diff)
downloadcpython-20882dd1742310c8cf6858354ecb150810adb95c.zip
cpython-20882dd1742310c8cf6858354ecb150810adb95c.tar.gz
cpython-20882dd1742310c8cf6858354ecb150810adb95c.tar.bz2
SF bug #516372: test_thread: unhandled exc. in thread
Fix exit races in test_thread.py and test_threaded_import.py. I suspect the bug is provokable only under Linux (where child threads seem to get lots of cycles before they get killed after the main thread exits), or on multi-processor machines running other OSes. Bugfix candidate.
Diffstat (limited to 'Lib/test/test_threaded_import.py')
-rw-r--r--Lib/test/test_threaded_import.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index e022c5f..d9f3d70 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -17,9 +17,13 @@ def task():
x = random.randrange(1, 3)
critical_section.acquire()
N -= 1
- if N == 0:
- done.release()
+ # Must release critical_section before releasing done, else the main
+ # thread can exit and set critical_section to None as part of global
+ # teardown; then critical_section.release() raises AttributeError.
+ finished = N == 0
critical_section.release()
+ if finished:
+ done.release()
# Tricky: When regrtest imports this module, the thread running regrtest
# grabs the import lock and won't let go of it until this module returns.