svn commit: r1592987 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py

[rh...@apache.org]

Author: rhuijben
Date: Wed May  7 12:13:06 2014
New Revision: 1592987

URL: http://svn.apache.org/r1592987
Log:
Following up on r1592717, process 'svnadmin dump' output as binary instead of
text. This resolves a Windows test failure in a test for eol handling in
properties.

* subversion/tests/cmdline/svntest/main.py
  (run_svnadmin): Detect when to return output as binary vs as text.

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=1592987&r1=1592986&r2=1592987&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed May  7 12:13:06 2014
@@ -705,7 +705,17 @@ def run_svn(error_expected, *varargs):
 def run_svnadmin(*varargs):
   """Run svnadmin with VARARGS, returns exit code as int; stdout, stderr as
   list of lines (including line terminators)."""
-  return run_command(svnadmin_binary, 1, False, *varargs)
+
+  use_binary = ('dump' in varargs)
+
+  exit_code, stdout_lines, stderr_lines = \
+                       run_command(svnadmin_binary, 1, use_binary, *varargs)
+
+  if use_binary and sys.platform == 'win32':
+    # Callers don't expect binary output on stderr
+    stderr_lines = [x.replace('\r', '') for x in stderr_lines]
+
+  return exit_code, stdout_lines, stderr_lines
 
 # For running svnlook.  Ignores the output.
 def run_svnlook(*varargs):