Author: rhuijben
Date: Thu Sep 7 13:17:18 2017
New Revision: 1807601
URL: http://svn.apache.org/viewvc?rev=1807601&view=rev
Log:
Remove another test of a now unsupported upgrade. Users still using these
development only working copy formats can upgrade via Subversion 1.7-1.9.
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_tree_conflict_data): Remove test.
(test_list): Update list.
* subversion/tests/cmdline/upgrade_tests_data/format_12a.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/format_12b.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/format_13.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/format_14.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/format_15.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/format_16.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/format_28.tar.bz2
* subversion/tests/cmdline/upgrade_tests_data/upgrade_tc.tar.bz2
Remove unreferenced test data.
Removed:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/format_12a.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/format_12b.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/format_13.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/format_14.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/format_15.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/format_16.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/format_28.tar.bz2
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_tc.tar.bz2
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=1807601&r1=1807600&r2=1807601&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Sep 7
13:17:18 2017
@@ -761,61 +761,6 @@ def dirs_only_upgrade(sbox):
})
run_and_verify_status_no_server(sbox.wc_dir, expected_status)
-def read_tree_conflict_data(sbox, path):
- dot_svn = svntest.main.get_admin_name()
- db = svntest.sqlite3.connect(os.path.join(sbox.wc_dir, dot_svn, 'wc.db'))
- for row in db.execute("select tree_conflict_data from actual_node "
- "where tree_conflict_data is not null "
- "and local_relpath = '%s'" % path):
- return
- raise svntest.Failure("conflict expected for '%s'" % path)
-
-def no_actual_node(sbox, path):
- dot_svn = svntest.main.get_admin_name()
- db = svntest.sqlite3.connect(os.path.join(sbox.wc_dir, dot_svn, 'wc.db'))
- for row in db.execute("select 1 from actual_node "
- "where local_relpath = '%s'" % path):
- raise svntest.Failure("no actual node expected for '%s'" % path)
-
-def upgrade_tree_conflict_data(sbox):
- "upgrade tree conflict data (f20->f21)"
-
- wc_dir = sbox.wc_dir
- replace_sbox_with_tarfile(sbox, 'upgrade_tc.tar.bz2')
-
- # Check and see if we can still read our tree conflicts
- expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
- expected_status.tweak('A/D/G/pi', status='D ', treeconflict='C')
- expected_status.tweak('A/D/G/tau', status='! ', treeconflict='C',
- wc_rev=None)
- expected_status.tweak('A/D/G/rho', status='A ', copied='+',
- treeconflict='C', wc_rev='-')
-
- # Look inside pre-upgrade database
- read_tree_conflict_data(sbox, 'A/D/G')
- no_actual_node(sbox, 'A/D/G/pi')
- no_actual_node(sbox, 'A/D/G/rho')
- no_actual_node(sbox, 'A/D/G/tau')
-
- # While the upgrade from f20 to f21 will work the upgrade from f22
- # to f23 will not, since working nodes are present.
- exit_code, output, errput = svntest.main.run_svn('format 22', 'upgrade',
- wc_dir)
-
- if not exit_code:
- run_and_verify_status_no_server(wc_dir, expected_status)
- else:
- if not svntest.verify.RegexOutput('.*format 22 with WORKING nodes.*',
- match_all=False).matches(errput):
- raise svntest.Failure()
-
- # Look insde post-upgrade database
- read_tree_conflict_data(sbox, 'A/D/G/pi')
- read_tree_conflict_data(sbox, 'A/D/G/rho')
- read_tree_conflict_data(sbox, 'A/D/G/tau')
- # no_actual_node(sbox, 'A/D/G') ### not removed but should be?
-
-
@Issue(3898)
def delete_in_copy_upgrade(sbox):
"upgrade a delete within a copy"
@@ -1585,7 +1530,6 @@ test_list = [ None,
missing_dirs2,
delete_and_keep_local,
dirs_only_upgrade,
- upgrade_tree_conflict_data,
delete_in_copy_upgrade,
replaced_files,
upgrade_with_scheduled_change,
