diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-07-17 12:57:22 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-07-17 12:57:22 +0000 |
| commit | f5668f13c8f69490af6bca0bd5221d00cd382342 (patch) | |
| tree | 8504fb6fbe86fd342e738757bebd86f20cfe562b /Lib/test/test_threading.py | |
| parent | db3409cec9e3bbd1844f861e1acb1436666e1e97 (diff) | |
| download | cpython-git-f5668f13c8f69490af6bca0bd5221d00cd382342.tar.gz | |
try to fix test_threading on the Windows bot
Diffstat (limited to 'Lib/test/test_threading.py')
| -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 8c1ecce2dd..44c3336b0a 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -338,7 +338,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(), "end of main\nend of thread\n") + data = p.stdout.read().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") |