From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 23 Oct 2009 22:06:37 +0000 (+0000)
Subject: Merged revisions 75641 via svnmerge from
X-Git-Tag: v3.1.2rc1~429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6779fb1a4420775c1a32ac5ef396d061996be01;p=python

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
  ........
................
---

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 1e1e625083..11876b1880 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -306,7 +306,8 @@ class ThreadTests(unittest.TestCase):
             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"")