subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1548251 - in /subversion/trunk/subversion/tests/cmdline: log_tests.py mergeinfo_tests.py
Date Thu, 05 Dec 2013 19:28:39 GMT
Author: breser
Date: Thu Dec  5 19:28:38 2013
New Revision: 1548251

URL: http://svn.apache.org/r1548251
Log:
Move the test for 'mergeinfo --log' to log_tests.py so we can validate the
output.

log_tests.py already has all the infrastucture to validate log messages,
don't see a ton of value in moving it around or duplciating it.

* subversion/tests/cmdline/mergeinfo_tests.py
  (mergeinfo_log, test_list): Remove mergeinfo_log and move it...

* subversion/tests/cmdline/log_tests.py
  (mergeinfo_log, test_list): here


Modified:
    subversion/trunk/subversion/tests/cmdline/log_tests.py
    subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1548251&r1=1548250&r2=1548251&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Thu Dec  5 19:28:38 2013
@@ -2554,6 +2554,33 @@ def log_auto_move(sbox):
   verify_move_log(sbox, '--auto-moves', server_has_auto_move())
   verify_move_log(sbox, '-v', 0)
 
+@SkipUnless(server_has_mergeinfo)
+def mergeinfo_log(sbox):
+  "'mergeinfo --log' on a path with mergeinfo"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  # make a branch 'A2'
+  sbox.simple_repo_copy('A', 'A2')  # r2
+  # make a change in branch 'A'
+  sbox.simple_mkdir('A/newdir')
+  sbox.simple_commit(message="Log message for revision 3.")  # r3
+  sbox.simple_update()
+
+  # Dummy up some mergeinfo.
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'ps', SVN_PROP_MERGEINFO, '/A:3',
+                                     sbox.ospath('A2'))
+
+  # test --log
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None,
+                                     None, [],
+                                     'mergeinfo', '--show-revs=merged',
+                                     '--log', sbox.repo_url + '/A',
+                                     sbox.ospath('A2'))
+  check_log_chain(parse_log_output(output), [3])
+
 
 
 ########################################################################
@@ -2603,6 +2630,7 @@ test_list = [ None,
               merge_sensitive_log_with_search,
               log_multiple_revs_spanning_rename,
               log_auto_move,
+              mergeinfo_log,
              ]
 
 if __name__ == '__main__':

Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=1548251&r1=1548250&r2=1548251&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Thu Dec  5 19:28:38 2013
@@ -783,30 +783,6 @@ def noninheritable_mergeinfo_not_always_
     '--show-revs', 'eligible', '-R')
 
 @SkipUnless(server_has_mergeinfo)
-def mergeinfo_log(sbox):
-  "'mergeinfo --log' on a path with mergeinfo"
-
-  sbox.build()
-  wc_dir = sbox.wc_dir
-
-  # make a branch 'A2'
-  sbox.simple_repo_copy('A', 'A2')  # r2
-  # make a change in branch 'A'
-  sbox.simple_mkdir('A/newdir')
-  sbox.simple_commit()  # r3
-  sbox.simple_update()
-
-  # Dummy up some mergeinfo.
-  svntest.actions.run_and_verify_svn(None, None, [],
-                                     'ps', SVN_PROP_MERGEINFO, '/A:3',
-                                     sbox.ospath('A2'))
-  svntest.actions.run_and_verify_svn(None,
-                                     None, [],
-                                     'mergeinfo', '--show-revs=merged',
-                                     '--log', sbox.repo_url + '/A',
-                                     sbox.ospath('A2'))
-
-@SkipUnless(server_has_mergeinfo)
 @Issue(4301)
 def mergeinfo_local_move(sbox):
   "'mergeinfo' on a locally moved path"
@@ -824,6 +800,7 @@ def mergeinfo_local_move(sbox):
 ########################################################################
 # Run the tests
 
+# Note that mergeinfo --log is tested in log_tests.py
 
 # list all tests here, starting with None:
 test_list = [ None,
@@ -838,7 +815,6 @@ test_list = [ None,
               wc_target_inherits_mergeinfo_from_repos,
               natural_history_is_not_eligible_nor_merged,
               noninheritable_mergeinfo_not_always_eligible,
-              mergeinfo_log,
               mergeinfo_local_move,
              ]
 



Mime
View raw message