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 2011/05/12 12:36:28 UTC
svn commit: r1102237 - in /subversion/trunk/subversion/tests/cmdline:
upgrade_tests.py upgrade_tests_data/tree-replace2.tar.bz2
Author: philip
Date: Thu May 12 10:36:27 2011
New Revision: 1102237
URL: http://svn.apache.org/viewvc?rev=1102237&view=rev
Log:
Add another XFail test for issue 3777, upgrade with replaced directories.
This triggers a different assert.
* subversion/tests/cmdline/upgrade_tests.py
(tree_replace2): New test.
(test_list): Add new test.
* subversion/tests/cmdline/upgrade_tests_data/tree-replace2.tar.bz2: New.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/tree-replace2.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=1102237&r1=1102236&r2=1102237&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu May 12 10:36:27 2011
@@ -911,6 +911,32 @@ def tree_replace1(sbox):
# D wc/B/D/f
# D wc/B/g
+@XFail()
+@Issue(3777)
+def tree_replace2(sbox):
+ "upgrade 1.6 with tree replaced (2)"
+
+ sbox.build(create_wc = False)
+ replace_sbox_with_tarfile(sbox, 'tree-replace2.tar.bz2')
+
+ svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
+ ### Check status (once upgrade no longer asserts)
+
+ # The working copy contains two trees B and C that have replaced
+ # each other
+
+ # deleted replaced by
+ # B B
+ # B/f
+ # B/D
+ # B/g
+ # B/E
+ # C C
+ # C/f
+ # C/D
+ # C/g
+ # C/E
########################################################################
# Run the tests
@@ -952,6 +978,7 @@ test_list = [ None,
replaced_files,
upgrade_with_scheduled_change,
tree_replace1,
+ tree_replace2,
]
Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/tree-replace2.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/tree-replace2.tar.bz2?rev=1102237&view=auto
==============================================================================
Binary file - no diff available.
Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/tree-replace2.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream