From ad703dc345cf38e46dd8963066f10a2dde3ce01a Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Thu, 17 Jul 2008 17:02:57 +0000 Subject: [PATCH] Merged revisions 65059 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r65059 | benjamin.peterson | 2008-07-17 07:57:22 -0500 (Thu, 17 Jul 2008) | 1 line try to fix test_threading on the Windows bot ........ --- 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 13581f770e500e..90869f2621d2e8 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -339,7 +339,8 @@ def joiningfunc(mainthread): import subprocess p = subprocess.Popen([sys.executable, "-c", script], stdout=subprocess.PIPE) rc = p.wait() - self.assertEqual(p.stdout.read().decode(), "end of main\nend of thread\n") + data = p.stdout.read().decode().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")