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/25 12:28:08 UTC
svn commit: r1127465 - in /subversion/trunk/subversion/tests/cmdline:
upgrade_tests.py upgrade_tests_data/depth_exclude.tar.bz2
Author: philip
Date: Wed May 25 10:28:08 2011
New Revision: 1127465
URL: http://svn.apache.org/viewvc?rev=1127465&view=rev
Log:
Add an XFAIL test for issue 3901, upgrade with depth=exclude.
* subversion/tests/cmdline/upgrade_tests.py
(depth_exclude): New test.
(test_list): Add new test.
* subversion/tests/cmdline/upgrade_tests_data/depth_exclude.tar.bz2: New.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude.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=1127465&r1=1127464&r2=1127465&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed May 25 10:28:08 2011
@@ -968,6 +968,24 @@ def upgrade_from_format_28(sbox):
assert not os.path.exists(old_pristine_path)
assert os.path.exists(new_pristine_path)
+@XFail()
+@Issue(3901)
+def depth_exclude(sbox):
+ "upgrade 1.6.x wc that has depth=exclude"
+
+ sbox.build(create_wc = False)
+ replace_sbox_with_tarfile(sbox, 'depth_exclude.tar.bz2')
+
+ svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
+ expected_status = svntest.wc.State(sbox.wc_dir,
+ {
+ '' : Item(status=' ', wc_rev='1'),
+ 'A' : Item(status=' ', wc_rev='1'),
+ 'X' : Item(status='A ', copied='+', wc_rev='-'),
+ })
+ run_and_verify_status_no_server(sbox.wc_dir, expected_status)
+
########################################################################
# Run the tests
@@ -1010,6 +1028,7 @@ test_list = [ None,
tree_replace1,
tree_replace2,
upgrade_from_format_28,
+ depth_exclude,
]
Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude.tar.bz2?rev=1127465&view=auto
==============================================================================
Binary file - no diff available.
Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/depth_exclude.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream