svn commit: r1739940 - /subversion/trunk/subversion/tests/cmdline/svntest/actions.py

[st...@apache.org]

Author: stsp
Date: Tue Apr 19 14:55:25 2016
New Revision: 1739940

URL: http://svn.apache.org/viewvc?rev=1739940&view=rev
Log:
* subversion/tests/cmdline/svntest/actions.py
  (_run_and_verify_resolve): Add new resolved notification output to this
   function's list of possible output. Fixes some test fallout.

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=1739940&r1=1739939&r2=1739940&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Tue Apr 19 14:55:25 2016
@@ -1797,6 +1797,15 @@ def _run_and_verify_resolve(cmd, expecte
          expected_paths] + [
         "Resolved conflicted state of '" + path + "'\n" for path in
         expected_paths]),
+      verify.UnorderedOutput([
+        "Merge conflicts in '" + path + "' marked as resolved.\n" for path in
+        expected_paths]),
+      verify.UnorderedRegexListOutput([
+        "Conflict in property.*at '" + path + "' marked as resolved.\n" \
+        for path in expected_paths]),
+      verify.UnorderedOutput([
+        "Tree conflict at '" + path + "' marked as resolved.\n" for path in
+        expected_paths]),
     ],
     match_all=False)
   run_and_verify_svn(expected_output, [],