Author: brane
Date: Fri May 22 11:26:13 2026
New Revision: 1934500
Log:
Sometimes XML output varies by RA type...
* subversion/tests/cmdline/log_tests.py
(log_xml_with_merge_history): Expect invalid XML output only when testing
against a local repository.
(is_ra_local_and_is_bad_xml_fatal): New XFail predicate for that condition.
Modified:
subversion/trunk/subversion/tests/cmdline/log_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py Fri May 22
10:24:41 2026 (r1934499)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Fri May 22
11:26:13 2026 (r1934500)
@@ -2804,7 +2804,11 @@ def log_with_merge_history_and_search(sb
sbox.ospath('A2'))
svntest.verify.validate_xml_schema('log', output)
-@XFail(svntest.main.is_bad_xml_fatal)
+
+def is_ra_local_and_is_bad_xml_fatal():
+ return svntest.main.is_ra_type_file() and svntest.main.is_bad_xml_fatal()
+
+@XFail(is_ra_local_and_is_bad_xml_fatal)
@Issue(4856)
def log_xml_with_merge_history(sbox):
"log --use-merge-history --xml"
