summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_threading.py
diff options
context:
space:
mode:
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 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")