1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make error more explicit in test_finalize_with_trace

Browse Source
This commit is contained in:
Antoine Pitrou 2010-09-19 23:28:30 +00:00
parent fedd481596
commit 7c08744f52
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_threading.py
View File

@ -304,7 +304,7 @@ class ThreadTests(BaseTestCase):
# Issue1733757 # Issue1733757
# Avoid a deadlock when sys.settrace steps into threading._shutdown # Avoid a deadlock when sys.settrace steps into threading._shutdown
import subprocess import subprocess
rc = subprocess.call([sys.executable, "-c", """if 1: p = subprocess.Popen([sys.executable, "-c", """if 1:
import sys, threading import sys, threading
# A deadlock-killer, to prevent the # A deadlock-killer, to prevent the
@ -324,9 +324,14 @@ class ThreadTests(BaseTestCase):
return func return func
sys.settrace(func) sys.settrace(func)
"""]) """],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
rc = p.returncode
self.assertFalse(rc == 2, "interpreted was blocked") self.assertFalse(rc == 2, "interpreted was blocked")
self.assertTrue(rc == 0, "Unexpected error") self.assertTrue(rc == 0,
"Unexpected error: " + ascii(stderr))
def test_join_nondaemon_on_shutdown(self): def test_join_nondaemon_on_shutdown(self):
# Issue 1722344 # Issue 1722344