From efbf6fc73eb00f905d75f932949637fdf9b637bb Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 23 Aug 2008 21:25:16 +0000 Subject: [PATCH] let Windows bots pass on test_threading --- Lib/test/test_threading.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index e9899c92d9..ce25d8d745 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -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") -- 2.40.0