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/10/19 13:08:17 UTC
svn commit: r1186092 - in /subversion/trunk/subversion/tests/cmdline:
upgrade_tests.py upgrade_tests_data/upgrade_missing_replaced.tar.bz2
Author: philip
Date: Wed Oct 19 11:08:17 2011
New Revision: 1186092
URL: http://svn.apache.org/viewvc?rev=1186092&view=rev
Log:
Add regression test for issue 4035, checksum!=NULL assert after upgrade.
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_missing_replaced): New test.
(test_list): Add new test.
* subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2:
New.
Added:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.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=1186092&r1=1186091&r2=1186092&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 11:08:17 2011
@@ -1233,6 +1233,27 @@ def upgrade_absent(sbox):
svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
None, None)
+@Issue(4035)
+@Wimp(4035)
+def upgrade_missing_replaced(sbox):
+ "upgrade with missing replaced dir"
+
+ sbox.build(read_only=True)
+ replace_sbox_with_tarfile(sbox, 'upgrade_missing_replaced.tar.bz2')
+
+ svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+ svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
+ 'd7130b12-92f6-45c9-9217-b9f0472c3fab')
+ svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+ 'file:///tmp/repo', sbox.repo_url,
+ sbox.wc_dir)
+
+ expected_output = svntest.wc.State(sbox.wc_dir, {
+ 'A/B/E/alpha' : Item(status='A '),
+ })
+ svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
+ None, None)
+
########################################################################
# Run the tests
@@ -1283,6 +1304,7 @@ test_list = [ None,
upgrade_locked,
upgrade_file_externals,
upgrade_absent,
+ upgrade_missing_replaced,
]
Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2?rev=1186092&view=auto
==============================================================================
Binary file - no diff available.
Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/x-bzip2