summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-10-23 21:55:36 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-10-23 21:55:36 (GMT)
commit899d1c64e36c1cda5821fbcc7cffc292cb84e288 (patch)
treeb2c03d6f5052f34b8058dab8ced6b68587084d52 /Lib/test
parent97115d190ab05177ee5d1af27a5cc8df9f5476a9 (diff)
downloadcpython-899d1c64e36c1cda5821fbcc7cffc292cb84e288.zip
cpython-899d1c64e36c1cda5821fbcc7cffc292cb84e288.tar.gz
cpython-899d1c64e36c1cda5821fbcc7cffc292cb84e288.tar.bz2
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 ........
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_threading.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index cc83476..8c4966b 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -320,7 +320,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"")