Author: philip
Date: Fri Apr 26 13:14:04 2013
New Revision: 1476181
URL: http://svn.apache.org/r1476181
Log:
XFail regression test for inherited properties after upgrading
a 1.6 working copy.
* subversion/tests/cmdline/upgrade_tests.py
(do_iprops_upgrade): New, code from iprops_upgrade.
(iprops_upgrade): Call do_iprops_upgrade.
(iprops_upgrade1_6): New test.
(test_funcs): Add new test.
* subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2:
New file.
* subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2:
New file.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2
(with props)
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.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=1476181&r1=1476180&r2=1476181&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Fri Apr 26
13:14:04 2013
@@ -1278,21 +1278,11 @@ def upgrade_from_1_7_conflict(sbox):
# a working copy used to cause a pointless 'upgrade required' error.
svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
-def iprops_upgrade(sbox):
- "inherited properties after upgrade"
+def do_iprops_upgrade(nonrootfile, rootfile, sbox):
- sbox.build()
wc_dir = sbox.wc_dir
- sbox.simple_copy('A', 'X')
- sbox.simple_propset('p', 'v', '')
- sbox.simple_propset('pA', 'vA', 'A')
- sbox.simple_propset('pX', 'vX', 'X')
- sbox.simple_commit()
- svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
- '8f4d0ebe-2ebf-4f62-ad11-804fd88c2382')
-
- replace_sbox_with_tarfile(sbox, 'iprops_upgrade_nonroot.tar.bz2')
+ replace_sbox_with_tarfile(sbox, nonrootfile)
svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
'file:///tmp/repo', sbox.repo_url, wc_dir)
@@ -1340,7 +1330,7 @@ def iprops_upgrade(sbox):
sbox.ospath('E'), expected_iprops, expected_explicit_props)
# Now try with a repository root working copy
- replace_sbox_with_tarfile(sbox, 'iprops_upgrade_root.tar.bz2')
+ replace_sbox_with_tarfile(sbox, rootfile)
svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
'file:///tmp/repo', sbox.repo_url, wc_dir)
@@ -1384,6 +1374,41 @@ def iprops_upgrade(sbox):
svntest.actions.run_and_verify_inherited_prop_xml(
sbox.ospath('A/B/E'), expected_iprops, expected_explicit_props)
+def iprops_upgrade(sbox):
+ "inherited properties after upgrade from 1.7"
+
+ sbox.build()
+
+ sbox.simple_copy('A', 'X')
+ sbox.simple_propset('p', 'v', '')
+ sbox.simple_propset('pA', 'vA', 'A')
+ sbox.simple_propset('pX', 'vX', 'X')
+ sbox.simple_commit()
+ svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
+ '8f4d0ebe-2ebf-4f62-ad11-804fd88c2382')
+
+ do_iprops_upgrade('iprops_upgrade_nonroot.tar.bz2',
+ 'iprops_upgrade_root.tar.bz2',
+ sbox)
+
+@XFail()
+def iprops_upgrade1_6(sbox):
+ "inherited properties after upgrade from 1.6"
+
+ sbox.build()
+
+ sbox.simple_copy('A', 'X')
+ sbox.simple_propset('p', 'v', '')
+ sbox.simple_propset('pA', 'vA', 'A')
+ sbox.simple_propset('pX', 'vX', 'X')
+ sbox.simple_commit()
+ svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
+ '8f4d0ebe-2ebf-4f62-ad11-804fd88c2382')
+
+ do_iprops_upgrade('iprops_upgrade_nonroot1_6.tar.bz2',
+ 'iprops_upgrade_root1_6.tar.bz2',
+ sbox)
+
########################################################################
# Run the tests
@@ -1437,6 +1462,7 @@ test_list = [ None,
upgrade_not_present_replaced,
upgrade_from_1_7_conflict,
iprops_upgrade,
+ iprops_upgrade1_6,
]
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2?rev=1476181&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/x-bzip2
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2?rev=1476181&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/x-bzip2
