[Python-checkins] r75642 - in python/branches/release31-maint: Lib/test/test_threading.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sat Oct 24 00:06:37 2009
New Revision: 75642

Log:
Merged revisions 75641 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75641 | antoine.pitrou | 2009-10-23 23:55:36 +0200 (ven., 23 oct. 2009) | 9 lines
  
  Merged revisions 75624 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r75624 | antoine.pitrou | 2009-10-23 14:01:13 +0200 (ven., 23 oct. 2009) | 3 lines
    
    Fix Windows buildbot failure
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_threading.py

Modified: python/branches/release31-maint/Lib/test/test_threading.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_threading.py	(original)
+++ python/branches/release31-maint/Lib/test/test_threading.py	Sat Oct 24 00:06:37 2009
@@ -306,7 +306,8 @@
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
-        self.assertEqual(stdout, b"Woke up, sleep function is: <built-in function sleep>\n")
+        self.assertEqual(stdout.strip(),
+            b"Woke up, sleep function is: <built-in function sleep>")
         stderr = re.sub(br"^\[\d+ refs\]", b"", stderr, re.MULTILINE).strip()
         self.assertEqual(stderr, b"")