svn commit: r1934334 - subversion/branches/utf8-cmdline/subversion/tests/cmdline

Author: jun66j5
Date: Mon May 18 07:25:08 2026
New Revision: 1934334

Log:
On the 'utf8-cmdline' branch: E721113 is no longer raised.

* subversion/tests/cmdline/basic_tests.py
  (argv_with_best_fit_chars):
    Adapt the unit test to the arguments in utf-8 bytes.

Modified:
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/basic_tests.py

Modified: subversion/branches/utf8-cmdline/subversion/tests/cmdline/basic_tests.py
==============================================================================
--- subversion/branches/utf8-cmdline/subversion/tests/cmdline/basic_tests.py	Mon May 18 05:33:59 2026	(r1934333)
+++ subversion/branches/utf8-cmdline/subversion/tests/cmdline/basic_tests.py	Mon May 18 07:25:08 2026	(r1934334)
@@ -3357,20 +3357,22 @@ def argv_with_best_fit_chars(sbox):
       yield chr(c), mbcs
 
   count = 0
-  # E721113: Conversion from UTF-16 failed: No mapping for the Unicode
-  # character exists in the target multi-byte code page.
-  expected_stderr = 'svn: E721113: '
+  # The argument is accepted as utf-8, but the output to the pipe is applied
+  # best-fit encoding conversion.
   for wc, mbcs in iter_bestfit_chars():
     count += 1
     logger.info('Code page %r - U+%04x -> 0x%s', codepage, ord(wc), mbcs.hex())
     if mbcs == b'"':
-      svntest.actions.run_and_verify_svn2(None, expected_stderr, 1, 'help',
+      expected_stderr = r'^"foo" "bar": unknown command'
+      svntest.actions.run_and_verify_svn2(None, expected_stderr, 0, 'help',
                                           'foo{0} {0}bar'.format(wc))
     elif mbcs == b'\\':
-      svntest.actions.run_and_verify_svn2(None, expected_stderr, 1, 'help',
+      expected_stderr = r'^"foo\\" \\"bar": unknown command'
+      svntest.actions.run_and_verify_svn2(None, expected_stderr, 0, 'help',
                                           'foo{0}" {0}"bar'.format(wc))
     elif mbcs == b' ':
-      svntest.actions.run_and_verify_svn2(None, expected_stderr, 1, 'help',
+      expected_stderr = r'^"foo bar": unknown command'
+      svntest.actions.run_and_verify_svn2(None, expected_stderr, 0, 'help',
                                           'foo{0}bar'.format(wc))
   if count == 0:
     raise svntest.Skip('No best fit characters in code page %r' % codepage)