From f6779fb1a4420775c1a32ac5ef396d061996be01 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 23 Oct 2009 22:06:37 +0000 Subject: 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 ........ ................ --- Lib/test/test_threading.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: \n") + self.assertEqual(stdout.strip(), + b"Woke up, sleep function is: ") stderr = re.sub(br"^\[\d+ refs\]", b"", stderr, re.MULTILINE).strip() self.assertEqual(stderr, b"") -- cgit v0.12