]> granicus.if.org Git - python/commitdiff
let Windows bots pass on test_threading
authorBenjamin Peterson <benjamin@python.org>
Sat, 23 Aug 2008 21:25:16 +0000 (21:25 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sat, 23 Aug 2008 21:25:16 +0000 (21:25 +0000)
Lib/test/test_threading.py

index e9899c92d90f3c03055affc57e3910fa696d638c..ce25d8d74557161780b3fbaf64c4ff11ccefb06d 100644 (file)
@@ -235,7 +235,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")