You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by fu...@apache.org on 2020/04/19 01:31:34 UTC
svn commit: r1876707 -
/subversion/trunk/subversion/tests/cmdline/svntest/actions.py
Author: futatuki
Date: Sun Apr 19 01:31:33 2020
New Revision: 1876707
URL: http://svn.apache.org/viewvc?rev=1876707&view=rev
Log:
Escape special characters in path when construct expected output regex.
* subversion/tests/cmdline/svntest/actions.py (_run_and_verify_resolve)
Reported by: jcorvel
Tested by: jcorvel
Modified:
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1876707&r1=1876706&r2=1876707&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Sun Apr 19 01:31:33 2020
@@ -1923,7 +1923,7 @@ def _run_and_verify_resolve(cmd, expecte
"Merge conflicts in '" + path + "' marked as resolved.\n" for path in
expected_paths]),
verify.UnorderedRegexListOutput([
- "Conflict in property.*at '" + path + "' marked as resolved.\n" \
+ "Conflict in property.*at '" + re.escape(path) + "' marked as resolved.\n" \
for path in expected_paths]),
verify.UnorderedOutput([
"Tree conflict at '" + path + "' marked as resolved.\n" for path in