[Python-checkins] r66003 - python/branches/release25-maint/Lib/test/test_threading.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Aug 23 23:25:16 2008
New Revision: 66003

Log:
let Windows bots pass on test_threading

Modified:
   python/branches/release25-maint/Lib/test/test_threading.py

Modified: python/branches/release25-maint/Lib/test/test_threading.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_threading.py	(original)
+++ python/branches/release25-maint/Lib/test/test_threading.py	Sat Aug 23 23:25:16 2008
@@ -235,7 +235,8 @@
         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")