svn commit: r1152115 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

[hw...@apache.org]

Author: hwright
Date: Fri Jul 29 06:05:52 2011
New Revision: 1152115

URL: http://svn.apache.org/viewvc?rev=1152115&view=rev
Log:
Add a couple of tests in followup to r1152026.

(There's probably an issue this is associated with, but I'm not sure which one
it is.  If you know, please update the tests and this log message!)

* subversion/tests/cmdline/copy_tests.py
  (commit_copied_half_of_move, commit_deleted_half_of_move): New.
  (test_list): Run the new tests.

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

Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1152115&r1=1152114&r2=1152115&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Jul 29 06:05:52 2011
@@ -5442,6 +5442,36 @@ def copy_and_move_conflicts(sbox):
   svntest.actions.verify_disk(wc('move-dest'), expected_disk, True)
 
 
+def commit_copied_half_of_move(sbox):
+  "attempt to commit the copied part of move"
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  iota_path = os.path.join(wc_dir, 'iota')
+  D_path = os.path.join(wc_dir, 'A', 'D')
+
+  svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path)
+
+  expected_error = "svn: E200009: Cannot commit"
+  svntest.actions.run_and_verify_svn(None, None, expected_error,
+                                     'commit', '-m', 'foo', D_path)
+
+
+@XFail()
+def commit_deleted_half_of_move(sbox):
+  "attempt to commit the deleted part of move"
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  iota_path = os.path.join(wc_dir, 'iota')
+  D_path = os.path.join(wc_dir, 'A', 'D')
+
+  svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path)
+
+  expected_error = "svn: E200009: Cannot commit"
+  svntest.actions.run_and_verify_svn(None, None, expected_error,
+                                     'commit', '-m', 'foo', iota_path)
+
 ########################################################################
 # Run the tests
 
@@ -5551,6 +5581,8 @@ test_list = [ None,
               copy_base_of_deleted,
               case_only_rename,
               copy_and_move_conflicts,
+              commit_copied_half_of_move,
+              commit_deleted_half_of_move,
              ]
 
 if __name__ == '__main__':