Author: futatuki
Date: Tue May 26 23:53:25 2020
New Revision: 1878143
URL: http://svn.apache.org/viewvc?rev=1878143&view=rev
Log:
* subversion/tests/cmdline/svntest/main.py (wait_on_pipe):
Accept any sequence of bytes even if it is not valid UTF-8 character
sequence.
Reported by: jcorvel
Tested by: jcorvel
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1878143&r1=1878142&r2=1878143&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue May 26
23:53:25 2020
@@ -527,10 +527,10 @@ def wait_on_pipe(waiter, binary_mode, st
# We always expect STDERR to be strings, not byte-arrays.
if not isinstance(stderr, str):
- stderr = stderr.decode("utf-8")
+ stderr = stderr.decode("utf-8", 'surrogateescape')
if not binary_mode:
if not isinstance(stdout, str):
- stdout = stdout.decode("utf-8")
+ stdout = stdout.decode("utf-8", 'surrogateescape')
# Normalize Windows line endings if in text mode.
if windows:
