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
........

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 13581f770e500e584f0b671905556458c70f5294..90869f2621d2e8317e2796f1d4acb86b38658bbd 100644 (file)
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -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")