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

[st...@apache.org]

Author: stsp
Date: Mon Aug  8 13:05:37 2011
New Revision: 1154948

URL: http://svn.apache.org/viewvc?rev=1154948&view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
  (commit_deleted_half_of_move): Cover the case where the delete-half of
   a move is picked up via recursion. Use sbox.ospath() where possible.

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=1154948&r1=1154947&r2=1154948&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Aug  8 13:05:37 2011
@@ -5524,9 +5524,11 @@ def commit_deleted_half_of_move(sbox):
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  D_path = os.path.join(wc_dir, 'A', 'D')
+  iota_path = sbox.ospath('iota')
+  A_path = sbox.ospath('A')
+  D_path = sbox.ospath('A/D')
 
+  # iota -> A/D/iota; verify we cannot commit just iota
   svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path)
 
   expected_error = "svn: E200009: Cannot commit '.*%s' because it was moved " \
@@ -5535,6 +5537,15 @@ def commit_deleted_half_of_move(sbox):
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'commit', '-m', 'foo', iota_path)
 
+  # A/D -> C; verify we cannot commit just A
+  C_path = sbox.ospath('C')
+
+  svntest.actions.run_and_verify_svn(None, None, [], 'mv', D_path, C_path)
+  expected_error = "svn: E200009: Cannot commit '.*%s' because it was moved " \
+                    "to '.*%s'" % (re.escape(D_path), re.escape(C_path))
+  svntest.actions.run_and_verify_svn(None, None, expected_error,
+                                     'commit', '-m', 'foo', A_path)
+
 ########################################################################
 # Run the tests