[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1889032 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
From:       julianfoad () apache ! org
Date:       2021-04-20 19:49:07
Message-ID: 20210420194907.5330117B4D7 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: julianfoad
Date: Tue Apr 20 19:49:07 2021
New Revision: 1889032

URL: http://svn.apache.org/viewvc?rev=1889032&view=rev
Log:
For issue #4874 "Avoid foreign repository merge if repository UUIDs match"

Automatically change the test's expectations from a warning to an error when
Subversion 1.16 comes out.

* subversion/tests/cmdline/merge_tests.py
  (merge_error_if_ambiguous_foreign_merge): Make expectations conditional on
    the Subversion client version.

Modified:
    subversion/trunk/subversion/tests/cmdline/merge_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1889032&r1=1889031&r2=1889032&view=diff
 ==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Apr 20 19:49:07 2021
@@ -18716,9 +18716,9 @@ def merge_error_if_ambiguous_foreign_mer
   # target URLs.
 
   # expect warning or error (E195012 SVN_ERR_CLIENT_UNRELATED_RESOURCES)?
-  expected_stdout = None  #if SVN_VER_MINOR < 16 else []
-  expected_stderr = '.*: E195012: .*'  #if SVN_VER_MINOR >= 15 else []
-  expected_exit = 0  #if SVN_VER_MINOR < 16 else 1
+  expected_stdout = None if svntest.main.SVN_VER_MINOR < 16 else []
+  expected_stderr = '.*: E195012: .*' if svntest.main.SVN_VER_MINOR >= 15 else []
+  expected_exit = 0 if svntest.main.SVN_VER_MINOR < 16 else 1
 
   # two-URL merge
   svntest.actions.run_and_verify_svn2(expected_stdout, expected_stderr,


[prev in list] [next in list] [prev in thread] [next in thread]