try to fix test_threading on the Windows bot

benjamin.peterson · benjamin.peterson · commit a7f3d156c69a · 2008-07-17T12:57:22.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@65059 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
@@ -338,7 +338,8 @@ def joiningfunc(mainthread):
         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")
 
