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

[da...@apache.org]

Author: danielsh
Date: Sat Feb 26 16:26:08 2022
New Revision: 1898443

URL: http://svn.apache.org/viewvc?rev=1898443&view=rev
Log:
multi-wc-format: Make svntest.main.run_svn() and friends not add
--compatible-version when a test has passed this option already.

The outgoing option name is the test suite programs' option name, as opposed to
svn(1)'s option name.

* subversion/tests/cmdline/svntest/main.py
  (_with_wc_format_version): Fix option name.

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=1898443&r1=1898442&r2=1898443&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Sat Feb 26 16:26:08 2022
@@ -801,7 +801,7 @@ def copy_trust(dst_cfgdir, src_cfgdir):
     shutil.copy(os.path.join(src_ssl_dir, f), os.path.join(dst_ssl_dir, f))
 
 def _with_wc_format_version(args):
-  if '--wc-format-version' in args or options.wc_format_version is None:
+  if '--compatible-version' in args or options.wc_format_version is None:
     return args
   non_opt_args = [a for a in args if not str(a).startswith('-')]
   if non_opt_args: