Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 65059 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65059 | benjamin.peterson | 2008-07-17 07:57:22 -0500 (Thu, 17 Jul 2008) | 1 line

  try to fix test_threading on the Windows bot
........
This commit is contained in:
Benjamin Peterson 2008-07-17 17:02:57 +00:00
parent 6f4f24fdc3
commit ad703dc345
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_threading.py
View File

@ -339,7 +339,8 @@ class ThreadJoinOnShutdown(unittest.TestCase):
import subprocess
p = subprocess.Popen([sys.executable, "-c", script], stdout=subprocess.PIPE)
rc = p.wait()
self.assertEqual(p.stdout.read().decode(), "end of main\nend of thread\n")
data = p.stdout.read().decode().replace('\r', '')
self.assertEqual(data, "end of main\nend of thread\n")
self.failIf(rc == 2, "interpreter was blocked")
self.failUnless(rc == 0, "Unexpected error")