Author: philip
Date: Tue Feb 2 18:55:18 2010
New Revision: 905743
URL: http://svn.apache.org/viewvc?rev=905743&view=rev
Log:
Delete of copied items isn't working very well so update the test
suite to reflect this.
* subversion/tests/cmdline/copy_tests.py
(copy_delete_commit): Delete a file that is a direct child of the copied
directory -- this triggers an assert during commit.
(test_list): XFail copy_delete_commit.
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=905743&r1=905742&r2=905743&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Tue Feb 2 18:55:18 2010
@@ -702,13 +702,16 @@
svntest.actions.run_and_verify_svn(None, None, [], 'cp',
B_path, B2_path)
- # delete a file
+ # delete two files
+ lambda_path = os.path.join(wc_dir, 'A', 'B2', 'lambda')
alpha_path = os.path.join(wc_dir, 'A', 'B2', 'E', 'alpha')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', alpha_path)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'rm', alpha_path, lambda_path)
# commit copied tree containing a deleted file
expected_output = svntest.wc.State(wc_dir, {
'A/B2' : Item(verb='Adding'),
+ 'A/B2/lambda' : Item(verb='Deleting'),
'A/B2/E/alpha' : Item(verb='Deleting'),
})
svntest.actions.run_and_verify_commit(wc_dir,
@@ -4332,7 +4335,7 @@
no_wc_copy_overwrites,
copy_modify_commit,
copy_files_with_properties,
- copy_delete_commit,
+ XFail(copy_delete_commit),
mv_and_revert_directory,
SkipUnless(copy_preserve_executable_bit, svntest.main.is_posix_os),
wc_to_repos,
|