[Python-3000-checkins] r65067 - in python/branches/py3k: Lib/test/test_threading.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Jul 17 19:02:57 2008
New Revision: 65067

Log:
Merged revisions 65059 via svnmerge from
svn+ssh://pythondev at 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
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/test_threading.py

Modified: python/branches/py3k/Lib/test/test_threading.py
==============================================================================
--- python/branches/py3k/Lib/test/test_threading.py (original)
+++ python/branches/py3k/Lib/test/test_threading.py Thu Jul 17 19:02:57 2008
@@ -339,7 +339,8 @@
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")