You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/12/29 18:49:52 UTC
svn commit: r1426792 - /subversion/trunk/subversion/tests/cmdline/
Author: rhuijben
Date: Sat Dec 29 17:49:51 2012
New Revision: 1426792
URL: http://svn.apache.org/viewvc?rev=1426792&view=rev
Log:
Remove support for running some tests on a per-dir workingcopy db from
tests that still have separate behavior for pre and post 1.7.
* subversion/tests/cmdline/copy_tests.py
(move_dir_back_and_forth): Remove multi db code.
* subversion/tests/cmdline/depth_tests.py
(make_depth_tree_conflicts): Remove multi db code.
* subversion/tests/cmdline/entries_tests.py
(obstructed_entries): Remove multi db code.
* subversion/tests/cmdline/lock_tests.py
(lock_switched_files,
lock_twice_in_one_wc): Remove multi db code.
* subversion/tests/cmdline/merge_tests.py
(merge_into_missing): Remove multi db expected results.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(mergeinfo_recording_in_skipped_merge,
tree_conflicts_merge_edit_onto_missing,
tree_conflicts_merge_del_onto_missing): Update expected results.
* subversion/tests/cmdline/patch_tests.py
(patch_add_new_dir,
patch_remove_empty_dirs): Update expected result.
* subversion/tests/cmdline/relocate_tests.py
(relocate_deleted_missing_copied): Update expected result.
* subversion/tests/cmdline/resolved_tests.py
(resolved_on_wc_root): Update expected result.
* subversion/tests/cmdline/revert_tests.py
(status_of_missing_dir_after_revert,
status_of_missing_dir_after_revert_replaced_with_history_dir):
Update expected result.
* subversion/tests/cmdline/stat_tests.py
(status_type_change,
status_type_change_to_symlink,
status_missing_dir,
status_dash_u_type_change): Update expected result.
* subversion/tests/cmdline/switch_tests.py
(tree_conflicts_on_switch_1_1,
tree_conflicts_on_switch_1_2): Update expected results.
* subversion/tests/cmdline/update_tests.py
(update_missing): Expect restores instead of adds.
(update_deleted_missing_dir,
another_hudson_problem): Update expected results.
(nested_in_read_only): Remove test.
(tree_conflicts_on_update_1_1,
tree_conflicts_on_update_1_2): Update expected results.
Modified:
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/entries_tests.py
subversion/trunk/subversion/tests/cmdline/lock_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/patch_tests.py
subversion/trunk/subversion/tests/cmdline/relocate_tests.py
subversion/trunk/subversion/tests/cmdline/resolved_tests.py
subversion/trunk/subversion/tests/cmdline/revert_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Sat Dec 29 17:49:51 2012
@@ -2458,22 +2458,11 @@ def move_dir_back_and_forth(sbox):
# Move the moved dir: D_moved back to its starting
# location at A/D.
- if svntest.main.wc_is_singledb(wc_dir):
- # In single-db target is gone on-disk after it was moved away, so this
- # move works ok
- expected_err = []
- else:
- # In !SINGLE_DB the target of the copy exists on-dir, so svn tries
- # to move the file below the deleted directory
- expected_err = '.*Cannot copy to .*as it is scheduled for deletion'
-
- svntest.actions.run_and_verify_svn(None, None, expected_err,
- 'mv', D_move_path, D_path)
-
- if svntest.main.wc_is_singledb(wc_dir):
- # Verify that the status indicates a replace with history
- expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.add({
+ svntest.actions.run_and_verify_svn(None, None, [], 'mv', D_move_path, D_path)
+
+ # Verify that the status indicates a replace with history
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.add({
'A/D' : Item(status='R ', copied='+', wc_rev='-'),
'A/D/G' : Item(status=' ', copied='+', wc_rev='-'),
'A/D/G/pi' : Item(status=' ', copied='+', wc_rev='-'),
@@ -2484,8 +2473,8 @@ def move_dir_back_and_forth(sbox):
'A/D/H/chi' : Item(status=' ', copied='+', wc_rev='-'),
'A/D/H/omega' : Item(status=' ', copied='+', wc_rev='-'),
'A/D/H/psi' : Item(status=' ', copied='+', wc_rev='-'),
- })
- svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ })
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
def copy_move_added_paths(sbox):
"copy and move added paths without commits"
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Sat Dec 29 17:49:51 2012
@@ -2452,9 +2452,8 @@ def make_depth_tree_conflicts(sbox):
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/mu',
'A/B', 'A/B/lambda', 'A/B/E/alpha', 'A/B/E/beta',
- 'A/D/gamma')
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_disk.remove('A/B/E', 'A/B/F')
+ 'A/D/gamma',
+ 'A/B/E', 'A/B/F')
# This test is set XFail because this (correct) status cannot be
# verified due to an "svn update" bug. The tree-conflict on A/B
Modified: subversion/trunk/subversion/tests/cmdline/entries_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/entries_tests.py Sat Dec 29 17:49:51 2012
@@ -185,11 +185,8 @@ def obstructed_entries(sbox):
entries = svntest.main.run_entriesdump(D_path)
check_names(entries, 'H')
- if svntest.main.wc_is_singledb(wc_dir):
- # Data is not missing in single-db
- validate(entries['H'], revision=1)
- else:
- validate(entries['H'], revision=-1)
+ # Data is not missing in single-db
+ validate(entries['H'], revision=1)
### need to get svn_wc__db_read_info() to generate obstructed_add
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Sat Dec 29 17:49:51 2012
@@ -855,12 +855,7 @@ def lock_switched_files(sbox):
expected_status.tweak('A/D/gamma', 'A/B/lambda', writelocked='K')
# In WC-NG locks are kept per working copy, not per file
- if svntest.main.wc_is_singledb(wc_dir):
- # In single-db you see these files are locked locally
- expected_status.tweak('A/B/E/alpha', 'iota', writelocked='K')
- else:
- # In multi-db you see these files are not locked in the right dir
- expected_status.tweak('A/B/E/alpha', 'iota', writelocked='O')
+ expected_status.tweak('A/B/E/alpha', 'iota', writelocked='K')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1437,15 +1432,10 @@ def lock_twice_in_one_wc(sbox):
os.chmod(mu2_path, 0700)
svntest.main.file_append(mu2_path, "Updated text")
- if svntest.main.wc_is_singledb(wc_dir):
- # Commit will just succeed as the DB owns the lock. It's a user decision
- # to commit the other target instead of the one originally locked
- expected_err = []
- else:
- # Commit should fail because it is locked in the other location
- expected_err = '.*(([Nn]o)|(Server)).*[lL]ock.*'
+ # Commit will just succeed as the DB owns the lock. It's a user decision
+ # to commit the other target instead of the one originally locked
- svntest.actions.run_and_verify_svn(None, None, expected_err,
+ svntest.actions.run_and_verify_svn(None, None, [],
'commit', mu2_path, '-m', '')
#----------------------------------------------------------------------
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Sat Dec 29 17:49:51 2012
@@ -1735,8 +1735,6 @@ def merge_into_missing(sbox):
sbox.build()
wc_dir = sbox.wc_dir
- single_db = svntest.main.wc_is_singledb(wc_dir)
-
F_path = sbox.ospath('A/B/F')
F_url = sbox.repo_url + '/A/B/F'
Q_path = os.path.join(F_path, 'Q')
@@ -1798,23 +1796,17 @@ def merge_into_missing(sbox):
expected_status = wc.State(F_path, {
'' : Item(status=' ', wc_rev=1),
'foo' : Item(status='! ', wc_rev=2),
- 'Q' : Item(status='! ', wc_rev='?'),
- })
+ 'Q' : Item(status='! ', wc_rev=2),
+ # Missing data still available
+ 'Q/R' : Item(status='! ', wc_rev=3),
+ 'Q/R/bar' : Item(status='! ', wc_rev=3),
+ 'Q/baz' : Item(status='! ', wc_rev=3),
+ })
expected_skip = wc.State(F_path, {
'Q' : Item(),
'foo' : Item(),
})
- if single_db:
- # Revision not lost
- expected_status.tweak('Q', wc_rev=2)
- # Missing data still available
- expected_status.add({
- 'Q/R' : Item(status='! ', wc_rev='3'),
- 'Q/R/bar' : Item(status='! ', wc_rev='3'),
- 'Q/baz' : Item(status='! ', wc_rev='3'),
- })
-
# Use --ignore-ancestry because merge tracking aware merges raise an
# error when the merge target is missing subtrees due to OS-level
# deletes.
@@ -1837,20 +1829,15 @@ def merge_into_missing(sbox):
expected_status = wc.State(F_path, {
'' : Item(status=' ', wc_rev=1),
'foo' : Item(status='! ', wc_rev=2),
- 'Q' : Item(status='! ', wc_rev='?'),
- })
- expected_mergeinfo_output = wc.State(F_path, {
- })
-
- if single_db:
+ 'Q' : Item(status='! ', entry_rev='?', wc_rev='2'),
# Revision is known and we can record mergeinfo
- expected_status.tweak('Q', wc_rev='2', entry_rev='?')
- expected_status.add({
- 'Q/R' : Item(status='! ', wc_rev='3'),
- 'Q/R/bar' : Item(status='! ', wc_rev='3'),
- 'Q/baz' : Item(status='! ', wc_rev='3'),
+ 'Q/R' : Item(status='! ', wc_rev='3'),
+ 'Q/R/bar' : Item(status='! ', wc_rev='3'),
+ 'Q/baz' : Item(status='! ', wc_rev='3'),
+ })
+ expected_mergeinfo_output = wc.State(F_path, {
})
-
+
svntest.actions.run_and_verify_merge(F_path, '1', '2', F_url, None,
expected_output,
expected_mergeinfo_output,
@@ -1879,18 +1866,11 @@ def merge_into_missing(sbox):
expected_status.add({
'A/B/F' : Item(status=' ', wc_rev=1),
'A/B/F/foo' : Item(status='! ', wc_rev=2),
- 'A/B/F/Q' : Item(status='! ', wc_rev='?'),
- })
- if single_db:
- # Revision known and mergeinfo recorded
- expected_status.tweak('A/B/F/Q', wc_rev='2')
- # Missing data still available
- expected_status.add({
- 'A/B/F/Q' : Item(status='! ', wc_rev='2'),
- 'A/B/F/Q/baz' : Item(status='! ', wc_rev='3'),
- 'A/B/F/Q/R' : Item(status='! ', wc_rev='3'),
- 'A/B/F/Q/R/bar' : Item(status='! ', wc_rev='3'),
- })
+ 'A/B/F/Q' : Item(status='! ', wc_rev=2),
+ 'A/B/F/Q/baz' : Item(status='! ', wc_rev='3'),
+ 'A/B/F/Q/R' : Item(status='! ', wc_rev='3'),
+ 'A/B/F/Q/R/bar' : Item(status='! ', wc_rev='3'),
+ })
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -4941,56 +4921,54 @@ def mergeinfo_inheritance(sbox):
# In single-db mode you can't create a disconnected working copy by just
# copying a subdir
- if svntest.main.wc_is_singledb(wc_dir):
- return
- # Copy the subtree A_COPY/B/E from the working copy, making the
- # disconnected WC E_only.
- other_wc = sbox.add_wc_path('E_only')
- svntest.actions.duplicate_dir(E_COPY_path, other_wc)
-
- # Update the disconnected WC it so it will get the most recent mergeinfo
- # from the repos when merging.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [], 'up',
- other_wc)
-
- # Merge r5:4 into the root of the disconnected WC.
- # E_only has no explicit mergeinfo and since it's the root of the WC
- # cannot inherit any mergeinfo from a working copy ancestor path. Nor
- # does it have any mergeinfo explicitly set on it in the repository.
- # An ancestor path on the repository side, A_COPY/B does have the merge
- # info '/A/B:5' however and E_only should inherit this, resulting in
- # empty mergeinfo after the removal of r5 (A_COPY has mergeinfo of
- # '/A:3' so this empty mergeinfo is needed to override that.
- expected_output = wc.State(other_wc,
- {'beta' : Item(status='U ')})
- expected_mergeinfo_output = wc.State(other_wc, {
- '' : Item(status=' G')
- })
- expected_elision_output = wc.State(other_wc, {
- })
- expected_status = wc.State(other_wc, {
- '' : Item(status=' M', wc_rev=7),
- 'alpha' : Item(status=' ', wc_rev=7),
- 'beta' : Item(status='M ', wc_rev=7),
- })
- expected_disk = wc.State('', {
- '' : Item(props={SVN_PROP_MERGEINFO : ''}),
- 'alpha' : Item("This is the file 'alpha'.\n"),
- 'beta' : Item("This is the file 'beta'.\n"),
- })
- expected_skip = wc.State(other_wc, { })
-
- svntest.actions.run_and_verify_merge(other_wc, '5', '4',
- sbox.repo_url + '/A/B/E', None,
- expected_output,
- expected_mergeinfo_output,
- expected_elision_output,
- expected_disk,
- expected_status,
- expected_skip,
- None, None, None, None,
- None, 1)
+ ## Copy the subtree A_COPY/B/E from the working copy, making the
+ ## disconnected WC E_only.
+ #other_wc = sbox.add_wc_path('E_only')
+ #svntest.actions.duplicate_dir(E_COPY_path, other_wc)
+ #
+ ## Update the disconnected WC it so it will get the most recent mergeinfo
+ ## from the repos when merging.
+ #svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [], 'up',
+ # other_wc)
+ #
+ ## Merge r5:4 into the root of the disconnected WC.
+ ## E_only has no explicit mergeinfo and since it's the root of the WC
+ ## cannot inherit any mergeinfo from a working copy ancestor path. Nor
+ ## does it have any mergeinfo explicitly set on it in the repository.
+ ## An ancestor path on the repository side, A_COPY/B does have the merge
+ ## info '/A/B:5' however and E_only should inherit this, resulting in
+ ## empty mergeinfo after the removal of r5 (A_COPY has mergeinfo of
+ ## '/A:3' so this empty mergeinfo is needed to override that.
+ #expected_output = wc.State(other_wc,
+ # {'beta' : Item(status='U ')})
+ #expected_mergeinfo_output = wc.State(other_wc, {
+ # '' : Item(status=' G')
+ # })
+ #expected_elision_output = wc.State(other_wc, {
+ # })
+ #expected_status = wc.State(other_wc, {
+ # '' : Item(status=' M', wc_rev=7),
+ # 'alpha' : Item(status=' ', wc_rev=7),
+ # 'beta' : Item(status='M ', wc_rev=7),
+ # })
+ #expected_disk = wc.State('', {
+ # '' : Item(props={SVN_PROP_MERGEINFO : ''}),
+ # 'alpha' : Item("This is the file 'alpha'.\n"),
+ # 'beta' : Item("This is the file 'beta'.\n"),
+ # })
+ #expected_skip = wc.State(other_wc, { })
+ #
+ #svntest.actions.run_and_verify_merge(other_wc, '5', '4',
+ # sbox.repo_url + '/A/B/E', None,
+ # expected_output,
+ # expected_mergeinfo_output,
+ # expected_elision_output,
+ # expected_disk,
+ # expected_status,
+ # expected_skip,
+ # None, None, None, None,
+ # None, 1)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -6964,9 +6942,7 @@ def merge_loses_mergeinfo(sbox):
expected_elision_output = wc.State(A_C_wc_dir, {
'' : Item(status=' U'),
})
- expected_disk = wc.State('', {'J': Item()})
- if svntest.main.wc_is_singledb(wc_dir):
- expected_disk.remove('J')
+ expected_disk = wc.State('', {})
expected_status = wc.State(A_C_wc_dir,
{ '' : Item(wc_rev=4, status=' M'),
'J' : Item(wc_rev=4, status='D ')
@@ -6985,11 +6961,8 @@ def merge_loses_mergeinfo(sbox):
expected_output = wc.State(A_C_wc_dir, {'K' : Item(status='A ')})
expected_disk = wc.State('', {
'K' : Item(),
- 'J' : Item(),
'' : Item(props={SVN_PROP_MERGEINFO : '/A/B:3'}),
})
- if svntest.main.wc_is_singledb(wc_dir):
- expected_disk.remove('J')
expected_status = wc.State(A_C_wc_dir,
{ '' : Item(wc_rev=4, status=' M'),
'K' : Item(status='A ',
@@ -14018,7 +13991,6 @@ def no_self_referential_filtering_on_add
'/A_COPY/C:8\n' +
'/A_COPY/C_MOVED:8',
'propname' : 'propval'}),
- 'C' : Item(),
'D' : Item(),
'D/G' : Item(),
'D/G/pi' : Item("This is the file 'pi'.\n"),
@@ -14030,8 +14002,6 @@ def no_self_referential_filtering_on_add
'D/H/psi' : Item("New content"),
'D/H/omega' : Item("New content"),
})
- if svntest.main.wc_is_singledb(wc_dir):
- expected_A_COPY_2_disk.remove('C')
expected_A_COPY_2_skip = wc.State(A_COPY_2_path, { })
svntest.actions.run_and_verify_merge(A_COPY_2_path, None, None,
sbox.repo_url + '/A', None,
@@ -15595,14 +15565,13 @@ def committed_case_only_move_and_revert(
})
expected_disk.tweak('', props={SVN_PROP_MERGEINFO : '/A:3,5'})
expected_disk.add({'c' : Item()})
- if svntest.main.wc_is_singledb(wc_dir):
- expected_disk.remove('C')
+ expected_disk.remove('C')
expected_status.tweak('MU', status=' ', wc_rev=4, copied=None)
expected_status.remove('mu')
expected_status.tweak('C', status='D ')
expected_status.tweak('', wc_rev=4)
expected_status.add({'c' : Item(status='A ', copied='+', wc_rev='-')})
- # This merge succeeds, but A_COPY/c is in a strange state, added with
+ # This merge succeeds. It used to leave a strange state, added with
# history but missing:
#
# M merge_tests-139\A_COPY
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Sat Dec 29 17:49:51 2012
@@ -625,7 +625,6 @@ def mergeinfo_recording_in_skipped_merge
'B' : Item(),
'B/lambda' : Item(contents="This is the file 'lambda'.\n"),
'B/F' : Item(),
- 'B/E' : Item(),
'D/gamma' : Item("This is the file 'gamma'.\n"),
'D/G' : Item(),
'D/G/pi' : Item("This is the file 'pi'.\n"),
@@ -636,9 +635,6 @@ def mergeinfo_recording_in_skipped_merge
'D/H/omega': Item("This is the file 'omega'.\n"),
'D/H/psi' : Item("This is the file 'psi'.\n"),
})
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- # Delete removes directories in single-db
- expected_disk.remove('B/E')
expected_skip = wc.State(A_COPY_path, {})
svntest.actions.run_and_verify_merge(A_COPY_path, None, None,
A_url, None,
@@ -1299,35 +1295,22 @@ def tree_conflicts_merge_edit_onto_missi
'F' : Item(status=' ', wc_rev=3),
'F/alpha' : Item(status='! ', wc_rev=3),
'D' : Item(status=' ', wc_rev=3),
- 'D/D1' : Item(status='! ', wc_rev='?'),
+ 'D/D1' : Item(status='! ', wc_rev='3', entry_rev='?'),
'DF' : Item(status=' ', wc_rev=3),
- 'DF/D1' : Item(status='! ', wc_rev='?'),
- 'DF/D1/beta' : Item(status=' '),
+ 'DF/D1' : Item(status='! ', wc_rev=3, entry_rev='?'),
+ 'DF/D1/beta' : Item(status='! ', wc_rev=3),
'DD' : Item(status=' ', wc_rev=3),
- 'DD/D1' : Item(status='! ', wc_rev='?'),
- 'DD/D1/D2' : Item(status=' '),
+ 'DD/D1' : Item(status='! ', wc_rev=3, entry_rev='?'),
+ 'DD/D1/D2' : Item(status='! ', wc_rev=3),
'DDF' : Item(status=' ', wc_rev=3),
- 'DDF/D1' : Item(status='! ', wc_rev='?'),
- 'DDF/D1/D2' : Item(status=' '),
- 'DDF/D1/D2/gamma' : Item(status=' '),
+ 'DDF/D1' : Item(status='! ', wc_rev=3, entry_rev='?'),
+ 'DDF/D1/D2' : Item(status='! ', wc_rev=3),
+ 'DDF/D1/D2/gamma' : Item(status='! ', wc_rev=3),
'DDD' : Item(status=' ', wc_rev=3),
- 'DDD/D1' : Item(status='! ', wc_rev='?'),
- 'DDD/D1/D2' : Item(status=' '),
- 'DDD/D1/D2/D3' : Item(status=' '),
- })
-
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_status.tweak('D/D1', wc_rev=3, entry_rev='?')
- expected_status.tweak('DF/D1', wc_rev=3, entry_rev='?')
- expected_status.tweak('DF/D1/beta', wc_rev=3, status='! ')
- expected_status.tweak('DD/D1', wc_rev=3, entry_rev='?')
- expected_status.tweak('DD/D1/D2', wc_rev=3, status='! ')
- expected_status.tweak('DDF/D1', wc_rev=3, entry_rev='?')
- expected_status.tweak('DDF/D1/D2', wc_rev=3, status='! ')
- expected_status.tweak('DDF/D1/D2/gamma', wc_rev=3, status='! ')
- expected_status.tweak('DDD/D1', wc_rev=3, entry_rev='?')
- expected_status.tweak('DDD/D1/D2', wc_rev=3, status='! ')
- expected_status.tweak('DDD/D1/D2/D3', wc_rev=3, status='! ')
+ 'DDD/D1' : Item(status='! ', wc_rev=3, entry_rev='?'),
+ 'DDD/D1/D2' : Item(status='! ', wc_rev=3),
+ 'DDD/D1/D2/D3' : Item(status='! ', wc_rev=3),
+ })
expected_skip = svntest.wc.State('', {
'F/alpha' : Item(),
@@ -1384,35 +1367,22 @@ def tree_conflicts_merge_del_onto_missin
'F' : Item(status=' ', wc_rev=3),
'F/alpha' : Item(status='! ', wc_rev=3),
'D' : Item(status=' ', wc_rev=3),
- 'D/D1' : Item(status='! ', wc_rev='?'),
+ 'D/D1' : Item(status='! ', wc_rev=3),
'DF' : Item(status=' ', wc_rev=3),
- 'DF/D1' : Item(status='! ', wc_rev='?'),
- 'DF/D1/beta' : Item(status=' '),
+ 'DF/D1' : Item(status='! ', wc_rev=3),
+ 'DF/D1/beta' : Item(status='! ', wc_rev=3),
'DD' : Item(status=' ', wc_rev=3),
- 'DD/D1' : Item(status='! ', wc_rev='?'),
- 'DD/D1/D2' : Item(status=' '),
+ 'DD/D1' : Item(status='! ', wc_rev=3),
+ 'DD/D1/D2' : Item(status='! ', wc_rev=3),
'DDF' : Item(status=' ', wc_rev=3),
- 'DDF/D1' : Item(status='! ', wc_rev='?'),
- 'DDF/D1/D2' : Item(status=' '),
- 'DDF/D1/D2/gamma' : Item(status=' '),
+ 'DDF/D1' : Item(status='! ', wc_rev=3),
+ 'DDF/D1/D2' : Item(status='! ', wc_rev=3),
+ 'DDF/D1/D2/gamma' : Item(status='! ', wc_rev=3),
'DDD' : Item(status=' ', wc_rev=3),
- 'DDD/D1' : Item(status='! ', wc_rev='?'),
- 'DDD/D1/D2' : Item(status=' '),
- 'DDD/D1/D2/D3' : Item(status=' '),
- })
-
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_status.tweak('D/D1', wc_rev=3)
- expected_status.tweak('DF/D1', wc_rev=3)
- expected_status.tweak('DF/D1/beta', wc_rev=3, status='! ')
- expected_status.tweak('DD/D1', wc_rev=3)
- expected_status.tweak('DD/D1/D2', wc_rev=3, status='! ')
- expected_status.tweak('DDF/D1', wc_rev=3)
- expected_status.tweak('DDF/D1/D2', wc_rev=3, status='! ')
- expected_status.tweak('DDF/D1/D2/gamma', wc_rev=3, status='! ')
- expected_status.tweak('DDD/D1', wc_rev=3)
- expected_status.tweak('DDD/D1/D2', wc_rev=3, status='! ')
- expected_status.tweak('DDD/D1/D2/D3', wc_rev=3, status='! ')
+ 'DDD/D1' : Item(status='! ', wc_rev=3),
+ 'DDD/D1/D2' : Item(status='! ', wc_rev=3),
+ 'DDD/D1/D2/D3' : Item(status='! ', wc_rev=3),
+ })
expected_skip = svntest.wc.State('', {
'F/alpha' : Item(),
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Sat Dec 29 17:49:51 2012
@@ -999,11 +999,7 @@ def patch_add_new_dir(sbox):
'X/Y/new' : Item(contents='new\n'),
'A/Z' : Item()
})
- expected_disk.remove('A/B/E/alpha')
- expected_disk.remove('A/B/E/beta')
- if svntest.main.wc_is_singledb(wc_dir):
- expected_disk.remove('A/B/E')
- expected_disk.remove('A/C')
+ expected_disk.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/C')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
@@ -1103,16 +1099,15 @@ def patch_remove_empty_dirs(sbox):
]
expected_disk = svntest.main.greek_state.copy()
- expected_disk.remove('A/D/H/chi')
- expected_disk.remove('A/D/H/psi')
- expected_disk.remove('A/D/H/omega')
- expected_disk.remove('A/B/lambda')
- expected_disk.remove('A/B/E/alpha')
- expected_disk.remove('A/B/E/beta')
- if svntest.main.wc_is_singledb(wc_dir):
- expected_disk.remove('A/B/E')
- expected_disk.remove('A/B/F')
- expected_disk.remove('A/B')
+ expected_disk.remove('A/D/H/chi',
+ 'A/D/H/psi',
+ 'A/D/H/omega',
+ 'A/B/lambda',
+ 'A/B',
+ 'A/B/E',
+ 'A/B/E/alpha',
+ 'A/B/E/beta',
+ 'A/B/F')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({'A/D/H/chi' : Item(status='! ', wc_rev=1)})
Modified: subversion/trunk/subversion/tests/cmdline/relocate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/relocate_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/relocate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/relocate_tests.py Sat Dec 29 17:49:51 2012
@@ -88,10 +88,7 @@ def relocate_deleted_missing_copied(sbox
'A/D2/H/omega' : Item(status=' ', wc_rev='-', copied='+'),
'A/D2/H/psi' : Item(status=' ', wc_rev='-', copied='+'),
})
- if svntest.main.wc_is_singledb(wc_dir):
- expected_status.tweak('A/B/F', status='! ', wc_rev='1')
- else:
- expected_status.tweak('A/B/F', status='! ', wc_rev='?')
+ expected_status.tweak('A/B/F', status='! ', wc_rev='1')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Relocate
@@ -105,14 +102,10 @@ def relocate_deleted_missing_copied(sbox
# Deleted and missing entries should be preserved, so update should
# show only A/B/F being reinstated
- if svntest.main.wc_is_singledb(wc_dir):
- expected_output = svntest.wc.State(wc_dir, {
+ expected_output = svntest.wc.State(wc_dir, {
'A/B/F' : Item(verb='Restored'),
- })
- else:
- expected_output = svntest.wc.State(wc_dir, {
- 'A/B/F' : Item(status='A '),
- })
+ })
+
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/mu')
expected_disk.add({
@@ -123,10 +116,7 @@ def relocate_deleted_missing_copied(sbox
'A/D2/H/omega' : Item("This is the file 'omega'.\n"),
'A/D2/H/psi' : Item("This is the file 'psi'.\n"),
})
- if not svntest.main.wc_is_singledb(wc_dir):
- expected_disk.add({
- 'A/D2/G' : Item(),
- })
+
expected_status.add({
'A/B/F' : Item(status=' ', wc_rev='2'),
})
Modified: subversion/trunk/subversion/tests/cmdline/resolved_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolved_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolved_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolved_tests.py Sat Dec 29 17:49:51 2012
@@ -111,11 +111,11 @@ def resolved_on_wc_root(sbox):
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('iota',
+ 'A/B',
'A/B/lambda',
- 'A/B/E/alpha', 'A/B/E/beta',
+ 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta',
+ 'A/B/F',
'A/D/gamma')
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_disk.remove('A/B/E', 'A/B/F', 'A/B')
expected_status = svntest.actions.get_virginal_state(wc, 2)
expected_status.tweak('iota', 'A/B', 'A/D/gamma',
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Sat Dec 29 17:49:51 2012
@@ -788,34 +788,22 @@ def status_of_missing_dir_after_revert(s
svntest.actions.run_and_verify_svn(None, expected_output, [], "revert",
A_D_G_path)
- deletes = [
- "D " + os.path.join(A_D_G_path, "pi") + "\n",
- "D " + os.path.join(A_D_G_path, "rho") + "\n",
- "D " + os.path.join(A_D_G_path, "tau") + "\n"
- ]
- expected_output = svntest.verify.UnorderedOutput(deletes)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
- "status", wc_dir)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',
+ status='D ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
svntest.main.safe_rmtree(A_D_G_path)
-
- expected_output = ["! " + A_D_G_path + "\n"]
-
- if svntest.main.wc_is_singledb(wc_dir):
- expected_output.extend(deletes)
-
- expected_output = svntest.verify.UnorderedOutput(expected_output)
-
- svntest.actions.run_and_verify_svn(None, expected_output, [], "status",
- wc_dir)
+ expected_status.tweak('A/D/G', status='! ')
+
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
# When using single-db, we can get back to the virginal state.
- if svntest.main.wc_is_singledb(wc_dir):
- svntest.actions.run_and_verify_svn(None, None, [], "revert",
- "-R", A_D_G_path)
+ svntest.actions.run_and_verify_svn(None, None, [], "revert",
+ "-R", A_D_G_path)
- expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
#----------------------------------------------------------------------
# Test for issue #2804 with replaced directory
@@ -910,14 +898,10 @@ def status_of_missing_dir_after_revert_r
svntest.main.safe_rmtree(G_path)
- if svntest.main.wc_is_singledb(wc_dir):
- expected_output = svntest.verify.UnorderedOutput(
+ expected_output = svntest.verify.UnorderedOutput(
["! " + G_path + "\n",
"! " + os.path.join(G_path, "alpha") + "\n",
"! " + os.path.join(G_path, "beta") + "\n"])
- else:
- expected_output = svntest.verify.UnorderedOutput(
- ["! " + G_path + "\n"])
svntest.actions.run_and_verify_svn(None, expected_output, [], "status",
wc_dir)
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Sat Dec 29 17:49:51 2012
@@ -179,7 +179,6 @@ def status_type_change(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- single_db = svntest.main.wc_is_singledb(wc_dir)
os.chdir(wc_dir)
@@ -189,8 +188,7 @@ def status_type_change(sbox):
os.rename('A', 'iota')
os.rename('was_iota', 'A')
- if single_db:
- expected_output = [
+ expected_output = [
'~ A\n',
'! A/mu\n',
'! A/B\n',
@@ -211,14 +209,9 @@ def status_type_change(sbox):
'! A/D/H/omega\n',
'! A/D/H/psi\n',
'~ iota\n',
- ]
+ ]
- expected_output = [s.replace('/', os.path.sep) for s in expected_output]
- else:
- expected_output = [
- '~ A\n',
- '~ iota\n',
- ]
+ expected_output = [s.replace('/', os.path.sep) for s in expected_output]
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
[], 'status')
@@ -228,10 +221,9 @@ def status_type_change(sbox):
os.remove('A')
os.mkdir('A')
- if single_db:
- # A is a directory again, so it is no longer missing, but it's
- # descendants are
- expected_output = [
+ # A is a directory again, so it is no longer missing, but it's
+ # descendants are
+ expected_output = [
'! A/mu\n',
'! A/B\n',
'! A/B/lambda\n',
@@ -251,15 +243,9 @@ def status_type_change(sbox):
'! A/D/H/omega\n',
'! A/D/H/psi\n',
'~ iota\n',
- ]
- # Fix separator for Windows
- expected_output = [s.replace('/', os.path.sep) for s in expected_output]
- else:
- # A misses its administrative area, so it is missing
- expected_output = [
- '~ A\n',
- '~ iota\n',
- ]
+ ]
+ # Fix separator for Windows
+ expected_output = [s.replace('/', os.path.sep) for s in expected_output]
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
[], 'status')
@@ -269,14 +255,6 @@ def status_type_change(sbox):
svntest.main.safe_rmtree('iota')
os.mkdir('iota')
- if not svntest.main.wc_is_singledb('.'):
- # A misses its administrative area, so it is still missing and
- # iota is still obstructed
- expected_output = [
- '~ A\n',
- '~ iota\n',
- ]
-
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
[], 'status')
@@ -287,7 +265,6 @@ def status_type_change_to_symlink(sbox):
sbox.build(read_only = True)
wc_dir = sbox.wc_dir
- single_db = svntest.main.wc_is_singledb(wc_dir)
os.chdir(wc_dir)
@@ -297,8 +274,7 @@ def status_type_change_to_symlink(sbox):
svntest.main.safe_rmtree('A/D')
os.symlink('bar', 'A/D')
- if single_db:
- expected_output = [
+ expected_output = [
'~ A/D\n',
'! A/D/gamma\n',
'! A/D/G\n',
@@ -310,12 +286,7 @@ def status_type_change_to_symlink(sbox):
'! A/D/H/omega\n',
'! A/D/H/psi\n',
'~ iota\n',
- ]
- else:
- expected_output = [
- '~ A/D\n',
- '~ iota\n',
- ]
+ ]
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
[], 'status')
@@ -1011,53 +982,40 @@ def status_missing_dir(sbox):
# ok, blow away the A/D/G directory
svntest.main.safe_rmtree(a_d_g)
- if svntest.main.wc_is_singledb(wc_dir):
- expected = [
+ expected = [
'! A/D/G\n',
'! A/D/G/rho\n',
'! A/D/G/pi\n',
'! A/D/G/tau\n',
- ]
- expected = [ s.replace('A/D/G', a_d_g).replace('/', os.path.sep)
- for s in expected ]
- else:
- expected = ["! " + a_d_g + "\n"]
+ ]
+ expected = [ s.replace('A/D/G', a_d_g).replace('/', os.path.sep)
+ for s in expected ]
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected), [],
"status", wc_dir)
- if svntest.main.wc_is_singledb(wc_dir):
- expected = [
+ expected = [
"! 1 " + a_d_g + "\n",
"! 1 " + os.path.join(a_d_g, "rho") + "\n",
"! 1 " + os.path.join(a_d_g, "pi") + "\n",
"! 1 " + os.path.join(a_d_g, "tau") + "\n",
- "Status against revision: 1\n" ]
- else:
- expected = [
- " * " + os.path.join(a_d_g, "pi") + "\n",
- " * " + os.path.join(a_d_g, "rho") + "\n",
- " * " + os.path.join(a_d_g, "tau") + "\n",
- "! * ? " + a_d_g + "\n",
- " * 1 " + sbox.ospath('A/D') + "\n",
- "Status against revision: 1\n" ]
+ "Status against revision: 1\n"
+ ]
# now run status -u, we should be able to do this without crashing
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected), [],
"status", "-u", wc_dir)
# Finally run an explicit status request directly on the missing directory.
- if svntest.main.wc_is_singledb(wc_dir):
- expected = [
+ expected = [
"! A/D/G\n",
"! A/D/G/rho\n",
"! A/D/G/pi\n",
"! A/D/G/tau\n",
]
- expected = [ s.replace('A/D/G', a_d_g).replace('/', os.path.sep)
- for s in expected ]
- else:
- expected = ["! " + a_d_g + "\n"]
+ expected = [ s.replace('A/D/G', a_d_g).replace('/', os.path.sep)
+ for s in expected ]
+
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected), [],
"status", a_d_g)
@@ -1731,8 +1689,7 @@ def status_dash_u_type_change(sbox):
svntest.main.safe_rmtree('A')
os.mkdir('A')
- if svntest.main.wc_is_singledb('.'):
- output =[
+ output = [
"! 1 A/mu\n",
"! 1 A/B\n",
"! 1 A/B/lambda\n",
@@ -1753,16 +1710,11 @@ def status_dash_u_type_change(sbox):
"! 1 A/D/H/psi\n",
"~ 1 iota\n",
"Status against revision: 1\n"
- ]
+ ]
- expected = svntest.verify.UnorderedOutput(
+ expected = svntest.verify.UnorderedOutput(
[s.replace('/', os.path.sep)
for s in output])
- else:
- expected = svntest.verify.UnorderedOutput(
- ["~ 1 iota\n",
- "~ ? A\n",
- "Status against revision: 1\n" ])
svntest.actions.run_and_verify_svn(None,
expected,
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Sat Dec 29 17:49:51 2012
@@ -2328,10 +2328,9 @@ def tree_conflicts_on_switch_1_1(sbox):
})
expected_disk = disk_empty_dirs.copy()
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
- 'DDF/D1', 'DDF/D1/D2',
- 'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
+ expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
# The files delta, epsilon, and zeta are incoming additions, but since
# they are all within locally deleted trees they should also be schedule
@@ -2441,10 +2440,9 @@ def tree_conflicts_on_switch_1_2(sbox):
expected_disk.remove('D/D1',
'DD/D1/D2',
'DDD/D1/D2/D3')
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_disk.remove('DF/D1', 'DD/D1',
- 'DDF/D1', 'DDF/D1/D2',
- 'DDD/D1', 'DDD/D1/D2')
+ expected_disk.remove('DF/D1', 'DD/D1',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2')
expected_info = {
'F/alpha' : {
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1426792&r1=1426791&r2=1426792&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sat Dec 29 17:49:51 2012
@@ -417,10 +417,7 @@ def update_missing(sbox):
svntest.main.safe_rmtree(H_path)
# In single-db mode all missing items will just be restored
- if svntest.main.wc_is_singledb(wc_dir):
- A_or_Restored = Item(verb='Restored')
- else:
- A_or_Restored = Item(status='A ')
+ A_or_Restored = Item(verb='Restored')
# Create expected output tree for an update of the missing items by name
expected_output = svntest.wc.State(wc_dir, {
@@ -1172,15 +1169,14 @@ def update_deleted_missing_dir(sbox):
})
# In single-db mode the missing items are restored before the update
- if svntest.main.wc_is_singledb(wc_dir):
- expected_output.add({
+ expected_output.add({
'A/D/H/psi' : Item(verb='Restored'),
'A/D/H/omega' : Item(verb='Restored'),
'A/D/H/chi' : Item(verb='Restored'),
'A/B/E/beta' : Item(verb='Restored'),
'A/B/E/alpha' : Item(verb='Restored')
# A/B/E and A/D/H are also restored, but are then overriden by the delete
- })
+ })
# Create expected disk tree for the update.
expected_disk = svntest.main.greek_state.copy()
@@ -1260,20 +1256,14 @@ def another_hudson_problem(sbox):
# Update missing directory to receive the delete, this should mark G
# as 'deleted' and should not alter gamma's entry.
- if not svntest.main.wc_is_singledb(wc_dir):
- expected_output = ["Updating '%s' ...\n" % (G_path),
- 'D '+G_path+'\n',
- 'Updated to revision 3.\n',
- ]
- else:
- expected_output = ["Updating '%s':\n" % (G_path),
- 'Restored \'' + G_path + '\'\n',
- 'Restored \'' + G_path + os.path.sep + 'pi\'\n',
- 'Restored \'' + G_path + os.path.sep + 'rho\'\n',
- 'Restored \'' + G_path + os.path.sep + 'tau\'\n',
- 'D '+G_path+'\n',
- 'Updated to revision 3.\n',
- ]
+ expected_output = ["Updating '%s':\n" % (G_path),
+ 'Restored \'' + G_path + '\'\n',
+ 'Restored \'' + G_path + os.path.sep + 'pi\'\n',
+ 'Restored \'' + G_path + os.path.sep + 'rho\'\n',
+ 'Restored \'' + G_path + os.path.sep + 'tau\'\n',
+ 'D '+G_path+'\n',
+ 'Updated to revision 3.\n',
+ ]
# Sigh, I can't get run_and_verify_update to work (but not because
# of issue 919 as far as I can tell)
@@ -1679,104 +1669,6 @@ def update_to_future_add(sbox):
#----------------------------------------------------------------------
-def nested_in_read_only(sbox):
- "update a nested wc in a read-only wc"
-
- sbox.build()
- wc_dir = sbox.wc_dir
-
- if svntest.main.wc_is_singledb(wc_dir):
- raise svntest.Skip('Unsupported in single-db')
-
- # Delete/commit a file
- alpha_path = sbox.ospath('A/B/E/alpha')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', alpha_path)
-
- expected_output = svntest.wc.State(wc_dir, {
- 'A/B/E/alpha' : Item(verb='Deleting'),
- })
-
- expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.remove('A/B/E/alpha')
-
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
-
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-
- expected_status.tweak(wc_rev=2)
-
- svntest.actions.run_and_verify_status(wc_dir, expected_status)
-
- # Delete/commit a directory that used to contain the deleted file
- B_path = sbox.ospath('A/B')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', B_path)
-
- expected_output = svntest.wc.State(wc_dir, {
- 'A/B' : Item(verb='Deleting'),
- })
-
- expected_status.remove('A/B', 'A/B/lambda', 'A/B/E', 'A/B/E/beta', 'A/B/F')
-
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
-
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-
- expected_status.tweak(wc_rev=3)
-
- svntest.actions.run_and_verify_status(wc_dir, expected_status)
-
- # Replace the deleted directory with a new checkout of an old
- # version of the directory, this gives it a "plausible" URL that
- # could be part of the containing wc
- B_url = sbox.repo_url + '/A/B'
- svntest.actions.run_and_verify_svn(None, None, [],
- 'checkout', '-r', '1', B_url + "@1",
- B_path)
-
- expected_status = svntest.wc.State(B_path, {
- '' : Item(),
- 'lambda' : Item(),
- 'E' : Item(),
- 'E/alpha' : Item(),
- 'E/beta' : Item(),
- 'F' : Item(),
- })
- expected_status.tweak(wc_rev=1, status=' ')
-
- svntest.actions.run_and_verify_status(B_path, expected_status)
-
- # Make enclosing wc read only
- os.chmod(os.path.join(wc_dir, 'A', svntest.main.get_admin_name()), 0555)
-
- try:
- # Update of nested wc should still work
- expected_output = svntest.wc.State(B_path, {
- 'E/alpha' : Item(status='D '),
- })
-
- expected_disk = wc.State('', {
- 'lambda' : wc.StateItem("This is the file 'lambda'.\n"),
- 'E' : wc.StateItem(),
- 'E/beta' : wc.StateItem("This is the file 'beta'.\n"),
- 'F' : wc.StateItem(),
- })
-
- expected_status.remove('E/alpha')
- expected_status.tweak(wc_rev=2)
-
- svntest.actions.run_and_verify_update(B_path,
- expected_output,
- expected_disk,
- expected_status,
- None, None, None, None, None, 0,
- '-r', '2', B_path)
- finally:
- os.chmod(os.path.join(wc_dir, 'A', svntest.main.get_admin_name()), 0777)
-
-#----------------------------------------------------------------------
-
def update_xml_unsafe_dir(sbox):
"update dir with xml-unsafe name"
@@ -4331,10 +4223,9 @@ def tree_conflicts_on_update_1_1(sbox):
})
expected_disk = disk_empty_dirs.copy()
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
- 'DDF/D1', 'DDF/D1/D2',
- 'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
+ expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
# The files delta, epsilon, and zeta are incoming additions, but since
# they are all within locally deleted trees they should also be schedule
@@ -4441,11 +4332,10 @@ def tree_conflicts_on_update_1_2(sbox):
### Why does the deep trees state not include files?
expected_disk.remove('D/D1',
'DD/D1/D2',
- 'DDD/D1/D2/D3')
- if svntest.main.wc_is_singledb(sbox.wc_dir):
- expected_disk.remove('DF/D1', 'DD/D1',
- 'DDF/D1', 'DDF/D1/D2',
- 'DDD/D1', 'DDD/D1/D2')
+ 'DDD/D1/D2/D3',
+ 'DF/D1', 'DD/D1',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2')
expected_info = {
'F/alpha' : {
@@ -5936,7 +5826,6 @@ test_list = [ None,
update_deletion_inside_out,
update_schedule_add_dir,
update_to_future_add,
- nested_in_read_only,
obstructed_update_alters_wc_props,
update_xml_unsafe_dir,
conflict_markers_matching_eol,