[Python-checkins] r65059 - python/trunk/Lib/test/test_threading.py

benjamin.peterson python-checkins at python.org
Thu Jul 17 14:57:22 CEST 2008


Author: benjamin.peterson
Date: Thu Jul 17 14:57:22 2008
New Revision: 65059

Log:
try to fix test_threading on the Windows bot

Modified:
   python/trunk/Lib/test/test_threading.py

Modified: python/trunk/Lib/test/test_threading.py
==============================================================================
--- python/trunk/Lib/test/test_threading.py	(original)
+++ python/trunk/Lib/test/test_threading.py	Thu Jul 17 14:57:22 2008
@@ -338,7 +338,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")
 


More information about the Python-checkins mailing list