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

[ju...@apache.org]

Author: julianfoad
Date: Fri Nov  5 02:10:41 2010
New Revision: 1031400

URL: http://svn.apache.org/viewvc?rev=1031400&view=rev
Log:
Add a test for a repos-to-WC copy onto a deleted path. A follow-up to r1031078
which made that case work. Also add a test for the same but
changing the node kind as well.

* subversion/tests/cmdline/copy_tests.py
  (copy_repos_over_deleted_same_kind, copy_repos_over_deleted_other_kind):
    New tests, the latter as XFail.

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=1031400&r1=1031399&r2=1031400&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Nov  5 02:10:41 2010
@@ -4835,6 +4835,28 @@ def delete_replace_delete(sbox):
   # Currently fails because pi, rho, tau get left behind
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
+def copy_repos_over_deleted_same_kind(sbox):
+  "copy repos node over deleted node, same kind"
+  sbox.build(read_only = True)
+
+  main.run_svn(None, 'rm', os.path.join(sbox.wc_dir, 'iota'),
+                           os.path.join(sbox.wc_dir, 'A/B'))
+  main.run_svn(None, 'cp', sbox.repo_url + '/A/mu',
+               os.path.join(sbox.wc_dir, 'iota'))
+  main.run_svn(None, 'cp', sbox.repo_url + '/A/D',
+               os.path.join(sbox.wc_dir, 'A/B'))
+
+def copy_repos_over_deleted_other_kind(sbox):
+  "copy repos node over deleted node, other kind"
+  sbox.build(read_only = True)
+
+  main.run_svn(None, 'rm', os.path.join(sbox.wc_dir, 'iota'),
+                           os.path.join(sbox.wc_dir, 'A/B'))
+  main.run_svn(None, 'cp', sbox.repo_url + '/iota',
+               os.path.join(sbox.wc_dir, 'A/B'))
+  main.run_svn(None, 'cp', sbox.repo_url + '/A/B',
+               os.path.join(sbox.wc_dir, 'iota'))
+
 
 ########################################################################
 # Run the tests
@@ -4934,6 +4956,8 @@ test_list = [ None,
               copy_delete_delete,
               XFail(copy_delete_revert),
               delete_replace_delete,
+              copy_repos_over_deleted_same_kind,
+              XFail(copy_repos_over_deleted_other_kind),
              ]
 
 if __name__ == '__main__':