summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_threading.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-10-23 22:06:37 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-10-23 22:06:37 (GMT)
commitf6779fb1a4420775c1a32ac5ef396d061996be01 (patch)
treebdc72ff30d5761f0443580ee19e451e5ada77597 /Lib/test/test_threading.py
parent1ff7f2c3a9e7d5ab252cd28d2bd651946ba8b2b8 (diff)
downloadcpython-f6779fb1a4420775c1a32ac5ef396d061996be01.zip
cpython-f6779fb1a4420775c1a32ac5ef396d061996be01.tar.gz
cpython-f6779fb1a4420775c1a32ac5ef396d061996be01.tar.bz2
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 ........ ................
Diffstat (limited to 'Lib/test/test_threading.py')
-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 1e1e625..11876b1 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"")