diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-08-23 21:25:16 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-08-23 21:25:16 +0000 |
| commit | efbf6fc73eb00f905d75f932949637fdf9b637bb (patch) | |
| tree | e5b0cce6b5679ab9e754b74f82730e79d8f6d725 /Lib/test | |
| parent | 8a8bfa0bc749f3c27e98b655f33a2b4237a637a8 (diff) | |
| download | cpython-git-efbf6fc73eb00f905d75f932949637fdf9b637bb.tar.gz | |
let Windows bots pass on test_threading
Diffstat (limited to 'Lib/test')
| -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 e9899c92d9..ce25d8d745 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -235,7 +235,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") |