From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 17 Jul 2008 12:57:22 +0000 (+0000)
Subject: try to fix test_threading on the Windows bot
X-Git-Tag: v2.6b2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5668f13c8f69490af6bca0bd5221d00cd382342;p=thirdparty%2FPython%2Fcpython.git

try to fix test_threading on the Windows bot
---

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 8c1ecce2dda0..44c3336b0af5 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -338,7 +338,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(), "end of main\nend of thread\n")
+        data = p.stdout.read().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")