subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1662666 - in /subversion/trunk/subversion/tests/cmdline: basic_tests.py trans_tests.py
Date Fri, 27 Feb 2015 11:50:46 GMT
Author: rhuijben
Date: Fri Feb 27 11:50:46 2015
New Revision: 1662666

URL: http://svn.apache.org/r1662666
Log:
* subversion/tests/cmdline/basic_tests.py
  (basic_update_corruption): Pass value as argument instead of as baton
    to a singleton handler.

* subversion/tests/cmdline/trans_tests.py
  (do_nothing): Remove function.
  (update_modified_with_translation): Use standard singleton handler.

Modified:
    subversion/trunk/subversion/tests/cmdline/basic_tests.py
    subversion/trunk/subversion/tests/cmdline/trans_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1662666&r1=1662665&r2=1662666&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Feb 27 11:50:46 2015
@@ -499,7 +499,9 @@ def basic_update_corruption(sbox):
                                         fail_output,
                                         expected_disk,
                                         fail_status,
-                                        "svn: E155017: Checksum", other_wc)
+                                        "svn: E155017: Checksum",
+                                        None, None, None, None,
+                                        None, other_wc)
 
   # Restore the uncorrupted text base.
   os.chmod(tb_dir_path, 0777)

Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=1662666&r1=1662665&r2=1662666&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Fri Feb 27 11:50:46 2015
@@ -449,9 +449,6 @@ def keywords_from_birth(sbox):
 # This is a slight rewrite of his test, to use the run_and_verify_* API.
 # This is for issue #631.
 
-def do_nothing(x, y):
-  return 0
-
 @Issue(631)
 def update_modified_with_translation(sbox):
   "update modified file with eol-style 'native'"
@@ -533,11 +530,13 @@ def update_modified_with_translation(sbo
 
   # Updating back to revision 1 should not error; the merge should
   # work, with eol-translation turned on.
+  extra_files = ['rho.r1', 'rho.r3', 'rho.mine']
   svntest.actions.run_and_verify_update(wc_dir,
                                         expected_output,
                                         expected_disk,
                                         None, None,
-                                        do_nothing, None,
+                                        svntest.tree.detect_conflict_files,
+                                        extra_files,
                                         None, None,
                                         0, '-r', '1', wc_dir)
 



Mime
View raw message