Author: rhuijben
Date: Fri Jul 29 12:46:38 2011
New Revision: 1152189
URL: http://svn.apache.org/viewvc?rev=1152189&view=rev
Log:
Add a test on copying a deleted node which happens to exist on disk. Currently
this tests raises an assertion on 1.7.x and trunk.
* subversion/tests/cmdline/copy_tests.py
(copy_deleted_dir): New test. Inserted before new in 1.8 tests, as I assume
it will be backported to 1.7.
(test_list): Add copy_deleted_dir.
Found by: stsp
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=1152189&r1=1152188&r2=1152189&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Jul 29 12:46:38
2011
@@ -5441,6 +5441,36 @@ def copy_and_move_conflicts(sbox):
})
svntest.actions.verify_disk(wc('move-dest'), expected_disk, True)
+@XFail()
+def copy_deleted_dir(sbox):
+ "try to copy a deleted directory that exists"
+ sbox.build(read_only = True)
+
+ sbox.simple_rm('iota')
+ sbox.simple_rm('A')
+
+ svntest.actions.run_and_verify_svn(None, None,
+ 'svn: E145000: Path.* does not exist',
+ 'cp', sbox.ospath('iota'),
+ sbox.ospath('new_iota'))
+ svntest.actions.run_and_verify_svn(None, None,
+ 'svn: E145000: Path.* does not exist',
+ 'cp', sbox.ospath('A/D'),
+ sbox.ospath('new_D'))
+
+ svntest.main.file_write(sbox.ospath('iota'), 'Not iota!')
+ os.mkdir(sbox.ospath('A'))
+ os.mkdir(sbox.ospath('A/D'))
+
+ # These two invocations raise an assertion.
+ svntest.actions.run_and_verify_svn(None, None,
+ 'svn: E155035: Deleted node.* can\'t
be.*',
+ 'cp', sbox.ospath('iota'),
+ sbox.ospath('new_iota'))
+ svntest.actions.run_and_verify_svn(None, None,
+ 'svn: E155035: Deleted node.* can\'t
be.*',
+ 'cp', sbox.ospath('A/D'),
+ sbox.ospath('new_D'))
@Issue(3631)
def commit_copied_half_of_move(sbox):
@@ -5583,6 +5613,7 @@ test_list = [ None,
copy_base_of_deleted,
case_only_rename,
copy_and_move_conflicts,
+ copy_deleted_dir,
commit_copied_half_of_move,
commit_deleted_half_of_move,
]
