You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/11/16 20:51:46 UTC
svn commit: r1035762 - in /subversion/trunk/subversion/tests/cmdline:
upgrade_tests.py upgrade_tests_data/delete-in-copy.tar.bz2
Author: philip
Date: Tue Nov 16 19:51:46 2010
New Revision: 1035762
URL: http://svn.apache.org/viewvc?rev=1035762&view=rev
Log:
Add an XFAIL regression test for upgrade of deletes within a copy that
is not a replace.
* subversion/tests/cmdline/upgrade_tests.py
(delete_in_copy_upgrade): New test.
(test_list): Mark test XFail.
* subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2: New.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2 (with props)
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1035762&r1=1035761&r2=1035762&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Tue Nov 16 19:51:46 2010
@@ -690,6 +690,28 @@ def upgrade_tree_conflict_data(sbox):
run_and_verify_status_no_server(wc_dir, expected_status)
+def delete_in_copy_upgrade(sbox):
+ "upgrade a delete within a copy"
+
+ sbox.build(create_wc = False)
+ wc_dir = sbox.wc_dir
+ replace_sbox_with_tarfile(sbox, 'delete-in-copy.tar.bz2')
+
+ # Doesn't work, creates spurious base nodes for the copy
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'upgrade', sbox.wc_dir)
+
+ expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+ expected_status.add({
+ 'A/B-copied' : Item(status='A ', copied='+', wc_rev='-'),
+ 'A/B-copied/lambda' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B-copied/E' : Item(status='D ', wc_rev='-'),
+ 'A/B-copied/E/alpha' : Item(status='D ', wc_rev='-'),
+ 'A/B-copied/E/beta' : Item(status='D ', wc_rev='-'),
+ 'A/B-copied/F' : Item(status=' ', copied='+', wc_rev='-'),
+ })
+ run_and_verify_status_no_server(sbox.wc_dir, expected_status)
+
########################################################################
# Run the tests
@@ -713,6 +735,7 @@ test_list = [ None,
XFail(delete_and_keep_local),
dirs_only_upgrade,
upgrade_tree_conflict_data,
+ XFail(delete_in_copy_upgrade),
]
Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2?rev=1035762&view=auto
==============================================================================
Binary file - no diff available.
Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream