Author: danielsh
Date: Sat Feb 26 16:28:41 2022
New Revision: 1898444
URL: http://svn.apache.org/viewvc?rev=1898444&view=rev
Log:
multi-wc-format: Don't assume test functions will use a particular option
syntax.
* subversion/tests/cmdline/svntest/main.py
(_with_wc_format_version): Detect both long option syntaxes.
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=1898444&r1=1898443&r2=1898444&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Sat Feb 26
16:28:41 2022
@@ -801,7 +801,9 @@ 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 '--compatible-version' in args or options.wc_format_version is None:
+ if '--compatible-version' in args \
+ or any(one_arg.startswith('--compatible-version=') for one_arg 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:
