svn commit: r1922064 - /subversion/trunk/subversion/tests/cmdline/svntest/verify.py

Author: dsahlberg
Date: Sun Nov 24 23:32:14 2024
New Revision: 1922064

URL: http://svn.apache.org/viewvc?rev=1922064&view=rev
Log:
Output the dump in repr() format instead of trying to decode to utf-8, which
would fail if a dump file contains non-utf-8 data.

* subversion/tests/cmdline/svntest/verify.py
  (compare_dump_files): replace X.decode('utf-8') with repr(X)

Suggested by: danielsh
https://lists.apache.org/thread/nondg6n2nydpbc2grf4j9cztmrkdd14s


Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/verify.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1922064&r1=1922063&r2=1922064&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Sun Nov 24 23:32:14 2024
@@ -852,7 +852,8 @@ def compare_dump_files(label_expected, l
     print('DIFF of raw dumpfiles (including expected differences)')
     print('--- ' + (label_expected or 'expected'))
     print('+++ ' + (label_actual or 'actual'))
-    print(''.join(ndiff([line.decode('utf-8') for line in expected], [line.decode('utf-8') for line in actual])))
+    print(''.join(ndiff([repr(line) for line in expected], 
+                        [repr(line) for line in actual])))
     raise svntest.Failure('DIFF of parsed dumpfiles (ignoring expected differences)\n'
                           + '\n'.join(ndiff(
           pprint.pformat(parsed_expected).splitlines(),