diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-07-17 17:02:57 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-07-17 17:02:57 (GMT) |
| commit | ad703dc345cf38e46dd8963066f10a2dde3ce01a (patch) | |
| tree | 2d419a8923f672646b9a88253521c8b9b318f099 /Lib | |
| parent | 6f4f24fdc312fb2a825835bf4c2be11e6c944c34 (diff) | |
| download | cpython-ad703dc345cf38e46dd8963066f10a2dde3ce01a.zip cpython-ad703dc345cf38e46dd8963066f10a2dde3ce01a.tar.gz cpython-ad703dc345cf38e46dd8963066f10a2dde3ce01a.tar.bz2 | |
Merged revisions 65059 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65059 | benjamin.peterson | 2008-07-17 07:57:22 -0500 (Thu, 17 Jul 2008) | 1 line
try to fix test_threading on the Windows bot
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_threading.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 13581f7..90869f2 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -339,7 +339,8 @@ class ThreadJoinOnShutdown(unittest.TestCase): import subprocess p = subprocess.Popen([sys.executable, "-c", script], stdout=subprocess.PIPE) rc = p.wait() - self.assertEqual(p.stdout.read().decode(), "end of main\nend of thread\n") + data = p.stdout.read().decode().replace('\r', '') + self.assertEqual(data, "end of main\nend of thread\n") self.failIf(rc == 2, "interpreter was blocked") self.failUnless(rc == 0, "Unexpected error") |