From: Neal Norwitz <nnorwitz@gmail.com>
Date: Wed, 26 Apr 2006 06:26:12 +0000 (+0000)
Subject: Fix this test on Solaris.  There can be embedded \r, so don't just replace
X-Git-Tag: v2.5a2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cc3b1ccef8f348ebfc36a13ec54e78423e9b4ff;p=python

Fix this test on Solaris.  There can be embedded \r, so don't just replace
the one at the end.
---

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 7b1f460ff1..59e51627dd 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -24,11 +24,11 @@ def normalize_output(data):
 
     # OSF/1 (Tru64) apparently turns \n into \r\r\n.
     if data.endswith('\r\r\n'):
-        return data[:-3] + '\n'
+        return data.replace('\r\r\n', '\n')
 
     # IRIX apparently turns \n into \r\n.
     if data.endswith('\r\n'):
-        return data[:-2] + '\n'
+        return data.replace('\r\n', '\n')
 
     return data