]> granicus.if.org Git - python/commitdiff
try to fix test_threading on the Windows bot
authorBenjamin Peterson <benjamin@python.org>
Thu, 17 Jul 2008 12:57:22 +0000 (12:57 +0000)
committerBenjamin Peterson <benjamin@python.org>
Thu, 17 Jul 2008 12:57:22 +0000 (12:57 +0000)
Lib/test/test_threading.py

index 8c1ecce2dda04ee102f9e589f2bca156a02236a7..44c3336b0af5b419749b3c9129a5ee7641f5cf5c 100644 (file)
@@ -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")