subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1766704 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Date Wed, 26 Oct 2016 16:52:45 GMT
Author: stsp
Date: Wed Oct 26 16:52:45 2016
New Revision: 1766704

URL: http://svn.apache.org/viewvc?rev=1766704&view=rev
Log:
Rename recently added test and fix its expectations.

* subversion/tests/cmdline/merge_reintegrate_tests.py
  (reintegrate_unsynced_into_renamed_branch): Rename to ...
  (reintegrate_noop_branch_into_renamed_branch): ... this. Explain the test
   setup correctly, and expect the final reintegrate merge to succeed.
  (test_list): Track renamed test.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1766704&r1=1766703&r2=1766704&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Oct 26 16:52:45
2016
@@ -2825,15 +2825,11 @@ def renamed_branch_reintegrate(sbox):
 
 @SkipUnless(server_has_mergeinfo)
 @XFail()
-def reintegrate_unsynced_into_renamed_branch(sbox):
-  """reintegrate unsynced branch into renamed branch"""
-
-  # The idea of this test is to ensure that the reintegrate merge is able to
-  # cope when one or both of the branches have been renamed.
-  # This test checks whether the reintegrate merge behaves correctly
-  # when checking for unsync revision ranges in the reintegrate source.
-  # The reintegrate merge should error out because of unsynced ranges.
-  # At the time this test was written, it failed with 'path not found'.
+def reintegrate_noop_branch_into_renamed_branch(sbox):
+  """reintegrate no-op branch into renamed branch"""
+  # In this test, the branch has no unique changes but contains a
+  # revision cherry-picked from trunk. Reintegrating such a branch
+  # should work, but used to error out when this test was written.
 
   # Make A_COPY branch in r2, and do a few more commits to A in r3-6.
   sbox.build()
@@ -2855,13 +2851,9 @@ def reintegrate_unsynced_into_renamed_br
   sbox.simple_commit()
   sbox.simple_update()
 
-  # Try to reintegrate the branch. This should fail with an
-  # 'unsynced ranges' error. But it fails instead with:
+  # Try to reintegrate the branch. This should work but used to fail with:
   # svn: E160013: File not found: revision 5, path '/A_RENAMED'
-  run_reintegrate_expect_error(sbox.repo_url + '/A_COPY',
-                               sbox.ospath('A_RENAMED'),
-                               [],
-                               "svn: E195016: Reintegrate can only be used if.*")
+  run_reintegrate(sbox.repo_url + '/A_COPY', sbox.ospath('A_RENAMED'))
 
 
 ########################################################################
@@ -2891,7 +2883,7 @@ test_list = [ None,
               reintegrate_symlink_deletion,
               no_op_reintegrate,
               renamed_branch_reintegrate,
-              reintegrate_unsynced_into_renamed_branch,
+              reintegrate_noop_branch_into_renamed_branch,
              ]
 
 if __name__ == '__main__':



Mime
View raw message