summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2003-04-26 00:21:31 (GMT)
committerGuido van Rossum <guido@python.org>2003-04-26 00:21:31 (GMT)
commitecf0f025180fc0a2df6eb638f4efeab7fb756ac9 (patch)
treec37ac712055910a6ddf9b4eef66c352a11df0a9c /Lib
parentfa1eddfb21ea0ec8b35d3b389c31a94d2baae9b8 (diff)
downloadcpython-ecf0f025180fc0a2df6eb638f4efeab7fb756ac9.zip
cpython-ecf0f025180fc0a2df6eb638f4efeab7fb756ac9.tar.gz
cpython-ecf0f025180fc0a2df6eb638f4efeab7fb756ac9.tar.bz2
Merge back from r23b1-branch
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_logging.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index d43b33e..93fb4a2 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -470,6 +470,8 @@ def test_main():
socketDataProcessed.acquire()
socketDataProcessed.wait()
socketDataProcessed.release()
+ for thread in threads:
+ thread.join()
banner("logrecv output", "begin")
sys.stdout.write(sockOut.getvalue())
sockOut.close()