You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/03/04 16:56:21 UTC
svn commit: r1664059 [8/11] - in /subversion/branches/reuse-ra-session: ./
build/generator/ doc/ subversion/bindings/javahl/native/
subversion/bindings/swig/ subversion/bindings/swig/include/
subversion/bindings/swig/python/libsvn_swig_py/ subversion/b...
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_tree_conflict_tests.py Wed Mar 4 15:56:18 2015
@@ -78,9 +78,7 @@ def delete_file_and_dir(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Rev 3 delete E and lambda from B
E_path = os.path.join(B_path, 'E')
@@ -98,9 +96,7 @@ def delete_file_and_dir(sbox):
'A/B/lambda')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def modify_B2():
# Local mods in B2
@@ -157,8 +153,7 @@ def delete_file_and_dir(sbox):
expected_disk,
expected_status2,
expected_skip,
- None, None, None, None, None,
- True)
+ check_props=True)
#----------------------------------------------------------------------
# This is a regression for issue #1176.
@@ -203,8 +198,7 @@ def merge_catches_nonexistent_target(sbo
### (M)odified child.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Change newfile, creating r3.
svntest.main.file_append(newfile_path, 'A change to newfile.\n')
@@ -214,8 +208,7 @@ def merge_catches_nonexistent_target(sbo
expected_status.tweak('A/D/Q/newfile', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Merge the change to newfile (from r3) into G, where newfile
# doesn't exist. This is a tree conflict (use case 4, see
@@ -258,7 +251,7 @@ def merge_catches_nonexistent_target(sbo
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, True)
+ check_props=True)
expected_status.add({
'newfile' : Item(status='! ', treeconflict='C'),
@@ -333,8 +326,7 @@ def merge_tree_deleted_in_target(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 0)
+ check_props=True)
expected_status.add({
'E' : Item(status='! ', treeconflict='C'),
})
@@ -377,8 +369,7 @@ def three_way_merge_add_of_existing_bina
"A/theta" : Item(status=" ", wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# In the working copy, attempt to 'svn merge branch_A_url@2 A_url@3 A'.
# We should *not* see a conflict during the merge, but an 'A'.
@@ -423,8 +414,8 @@ def three_way_merge_add_of_existing_bina
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 0, '--allow-mixed-revisions', A_path)
+ [], True, False,
+ '--allow-mixed-revisions', A_path)
#----------------------------------------------------------------------
# Issue #2515
@@ -482,9 +473,7 @@ def merge_added_dir_to_deleted_in_target
expected_elision_output,
expected_disk,
None,
- expected_skip,
- None, None, None, None, None,
- 0, 0)
+ expected_skip)
#----------------------------------------------------------------------
# Issue 2584
@@ -514,8 +503,7 @@ def merge_add_over_versioned_file_confli
'A/C/alpha' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# Merge r1:2 from A/C to A/B/E. This will attempt to add A/C/alpha,
# but since A/B/E/alpha already exists we get a tree conflict.
@@ -573,14 +561,14 @@ def mergeinfo_recording_in_skipped_merge
expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
wc_status.add({'A/mu' : Item(status=' ', wc_rev=3)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Make a modification to A/B/E/alpha
svntest.main.file_write(alpha_path, "This is the file 'alpha' modified.\n")
expected_output = wc.State(wc_dir, {'A/B/E/alpha' : Item(verb='Sending')})
wc_status.add({'A/B/E/alpha' : Item(status=' ', wc_rev=4)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Delete A_COPY/B/E
svntest.actions.run_and_verify_svn(None, [], 'rm',
@@ -644,8 +632,7 @@ def mergeinfo_recording_in_skipped_merge
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
def del_differing_file(sbox):
@@ -1534,7 +1521,7 @@ def merge_replace_setup(sbox):
})
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# ACTIONS ON THE MERGE SOURCE (branch)
# various deletes of files and dirs
@@ -1566,8 +1553,7 @@ def merge_replace_setup(sbox):
'branch/D/H/chi', 'branch/D/H/psi', 'branch/D/G/pi', 'branch/B/E',
'branch/B/E/beta', 'branch/B/E/alpha')
- actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
- None, wc_dir)
+ actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {})
@@ -1579,7 +1565,7 @@ def merge_replace_setup(sbox):
expected_status.tweak(wc_rev='3')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# replacements.
# file-with-file
@@ -1643,8 +1629,7 @@ def merge_replace_setup(sbox):
'branch/mu' : Item(status=' ', wc_rev='4'),
})
- actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
- None, wc_dir)
+ actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
return expected_disk, expected_status
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/mergeinfo_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/mergeinfo_tests.py Wed Mar 4 15:56:18 2015
@@ -234,7 +234,7 @@ def non_inheritable_mergeinfo(sbox):
})
expected_status.tweak('A_COPY', 'A_COPY/D/G/rho', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Update the WC a last time to ensure full inheritance.
svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [], 'up',
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/move_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/move_tests.py Wed Mar 4 15:56:18 2015
@@ -152,7 +152,7 @@ def move_file_test(sbox, source, dest, m
# update to start_rev
svntest.actions.run_and_verify_update(wc_dir, test['start_output'],
test['start_disk'], test['start_status'],
- None, None, None, None, None, False,
+ [], False,
'-r', test['start_rev'], wc_dir)
# execute the move
move_func(test['start_rev'])
@@ -162,7 +162,7 @@ def move_file_test(sbox, source, dest, m
# properties.
svntest.actions.run_and_verify_update(wc_dir, test['up_output'],
test['up_disk'], test['up_status'],
- None, None, None, None, None, True,
+ [], True,
'-r', test['end_rev'], wc_dir)
revert_paths = None
@@ -1403,8 +1403,7 @@ def move_many_update_add(sbox):
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status,
- None, None, None,
- None, None, None,
+ [], False,
wc_dir, '--accept', 'mine-conflict')
# And another one
@@ -1434,8 +1433,7 @@ def move_many_update_add(sbox):
# This currently triggers an assertion failure
svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
expected_status,
- None, None, None,
- None, None, None,
+ [], False,
wc_dir, '--accept', 'mine-conflict')
@Issue(4437)
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/patch_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/patch_tests.py Wed Mar 4 15:56:18 2015
@@ -102,7 +102,7 @@ def patch(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -377,7 +377,7 @@ def patch_offset(sbox):
expected_status.tweak('A/mu', wc_rev=2)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -546,7 +546,7 @@ def patch_chopped_leading_spaces(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -716,7 +716,7 @@ def patch_strip1(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -869,7 +869,7 @@ def patch_no_index_line(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/gamma', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
unidiff_patch = [
"--- A/D/gamma\t(revision 1)\n",
"+++ A/D/gamma\t(working copy)\n",
@@ -1148,7 +1148,7 @@ def patch_reject(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/gamma', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
patch_file_path = make_patch_path(sbox)
@@ -1219,7 +1219,7 @@ def patch_keywords(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/gamma', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
patch_file_path = make_patch_path(sbox)
@@ -1308,7 +1308,7 @@ def patch_with_fuzz(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
unidiff_patch = [
"Index: mu\n",
@@ -1444,7 +1444,7 @@ def patch_reverse(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -1943,7 +1943,7 @@ def patch_with_ignore_whitespace(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch with leading and trailing spaces removed and tabs transformed
# to spaces. The patch should match and the hunks should be written to the
@@ -2077,7 +2077,7 @@ def patch_replace_locally_deleted_file(s
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Locally delete mu
svntest.main.run_svn(None, 'rm', mu_path)
@@ -2143,7 +2143,7 @@ def patch_no_eol_at_eof(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
unidiff_patch = [
"--- iota\t(revision 1)\n",
"+++ iota\t(working copy)\n",
@@ -2213,7 +2213,7 @@ def patch_with_properties(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
unidiff_patch = [
@@ -2306,7 +2306,7 @@ def patch_same_twice(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -2491,7 +2491,7 @@ def patch_dir_properties(sbox):
expected_status.tweak('', wc_rev=2)
expected_status.tweak('A/B', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
unidiff_patch = [
@@ -2713,7 +2713,7 @@ def patch_prop_offset(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -2888,7 +2888,7 @@ def patch_prop_with_fuzz(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
unidiff_patch = [
"Index: mu\n",
@@ -3072,7 +3072,7 @@ def patch_old_target_names(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -3198,7 +3198,7 @@ def patch_reverse_revert(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
@@ -3520,7 +3520,7 @@ def patch_moved_away(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Move mu away
sbox.simple_move("A/mu", "A/mu2")
@@ -3681,7 +3681,7 @@ def patch_deletes_prop(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Apply patch
unidiff_patch = [
@@ -3828,7 +3828,7 @@ def patch_reversed_add_with_props2(sbox)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({'newfile' : Item(wc_rev=2, status=' ')})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Now, we'll try to reverse-apply the very diff we just created. We
# expect the original state of the working copy in r1 plus 'newfile'
@@ -4019,7 +4019,7 @@ def patch_target_no_eol_at_eof(sbox):
expected_status.tweak('iota', wc_rev=2)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
unidiff_patch = [
"Index: A/mu\n",
"===================================================================\n",
@@ -4222,8 +4222,7 @@ def patch_change_symlink_target(sbox):
expected_output = svntest.wc.State(wc_dir, {
'link' : Item(verb='Adding'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
patch_output = [
'U %s\n' % sbox.ospath('link'),
@@ -4236,8 +4235,7 @@ def patch_change_symlink_target(sbox):
expected_output = svntest.wc.State(wc_dir, {
'link' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
# r4 - Now as symlink
sbox.simple_rm('link')
@@ -4245,8 +4243,7 @@ def patch_change_symlink_target(sbox):
expected_output = svntest.wc.State(wc_dir, {
'link' : Item(verb='Replacing'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
svntest.actions.run_and_verify_svn(patch_output, [],
'patch', patch_file_path, wc_dir)
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/prop_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/prop_tests.py Wed Mar 4 15:56:18 2015
@@ -133,9 +133,7 @@ def commit_props(sbox):
# Commit the one file.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
@@ -169,16 +167,14 @@ def update_props(sbox):
# Commit property mods
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Add more properties
sbox.simple_propset('blue2', 'azul2', 'A/mu')
sbox.simple_propset('red2', 'rojo2', 'A/D/H')
expected_status.tweak('A/mu', 'A/D/H', wc_rev=3, status=' ')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create expected output tree for an update of the wc_backup.
expected_output = svntest.wc.State(wc_backup, {
@@ -201,7 +197,7 @@ def update_props(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1,
+ [], 1,
'-r', '2', wc_backup)
# This adds properties to nodes that have properties
@@ -214,7 +210,7 @@ def update_props(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1,
+ [], 1,
'-r', '3', wc_backup)
@@ -243,8 +239,7 @@ def downdate_props(sbox):
# Commit the one file.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Make some mod (something to commit)
svntest.main.file_append(mu_path, "some mod")
@@ -261,8 +256,7 @@ def downdate_props(sbox):
# Commit the one file.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create expected output tree for an update.
expected_output = svntest.wc.State(wc_dir, {
@@ -281,7 +275,7 @@ def downdate_props(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1,
+ [], 1,
'-r', '1', wc_dir)
#----------------------------------------------------------------------
@@ -313,8 +307,7 @@ def remove_props(sbox):
# Commit the one file.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -362,14 +355,8 @@ def update_conflict_props(sbox):
expected_output,
expected_disk,
expected_status,
- None,
- svntest.tree.detect_conflict_files,
- extra_files,
- None, None, 1)
-
- if len(extra_files) != 0:
- logger.warn("didn't get expected conflict files")
- raise svntest.verify.SVNUnexpectedOutput
+ check_props=True,
+ extra_files=extra_files)
# Resolve the conflicts
svntest.actions.run_and_verify_resolved([mu_path, A_path])
@@ -404,8 +391,7 @@ def commit_conflict_dirprops(sbox):
sbox.simple_propset('foo', 'eek', '')
svntest.actions.run_and_verify_commit(wc_dir, None, None,
- "[oO]ut[- ]of[- ]date",
- wc_dir)
+ ".*[oO]ut[- ]of[- ]date.*")
#----------------------------------------------------------------------
@@ -464,8 +450,7 @@ def commit_replacement_props(sbox):
expected_status.tweak('A/B/lambda', wc_rev=3, status=' ')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -529,8 +514,7 @@ def revert_replacement_props(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- 1)
+ check_props=True)
#----------------------------------------------------------------------
@Issues(920,2065)
@@ -1001,9 +985,7 @@ def binary_props(sbox):
# Commit the propsets.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Create expected output, disk, and status trees for an update of
# the wc_backup.
@@ -1021,8 +1003,7 @@ def binary_props(sbox):
svntest.actions.run_and_verify_update(wc_backup,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None, 0)
+ expected_status)
# Now, check those properties.
svntest.actions.check_prop('prop_zb', B_path_bak, [prop_zb])
@@ -1268,8 +1249,7 @@ def update_props_on_wc_root(sbox):
# Commit the working copy
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create expected output tree for an update of the wc_backup.
expected_output = svntest.wc.State(wc_backup, {
@@ -1289,7 +1269,7 @@ def update_props_on_wc_root(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1)
+ check_props=True)
# test for issue 2743
@Issue(2743)
@@ -1527,8 +1507,7 @@ def remove_custom_ns_props(sbox):
# Commit the one file.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create expected trees for the update.
expected_output = svntest.wc.State(wc_backup, {
@@ -1543,7 +1522,7 @@ def remove_custom_ns_props(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1)
+ check_props=True)
def props_over_time(sbox):
"property retrieval with peg and operative revs"
@@ -2316,7 +2295,7 @@ def file_matching_dir_prop_reject(sbox):
'A/dir_conflicts' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Modify/commit property change
sbox.simple_propset('prop', 'val2', 'A/dir_conflicts')
@@ -2327,7 +2306,7 @@ def file_matching_dir_prop_reject(sbox):
})
expected_status.tweak('A', 'A/dir_conflicts', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Local property mod
sbox.simple_propset('prop', 'val3', 'A/dir_conflicts')
@@ -2352,13 +2331,9 @@ def file_matching_dir_prop_reject(sbox):
expected_output,
expected_disk,
expected_status,
- None,
- svntest.tree.detect_conflict_files,
- extra_files,
- None, None, True, '-r', '2', wc_dir)
- if len(extra_files) != 0:
- logger.warn("didn't get expected conflict files")
- raise svntest.verify.SVNUnexpectedOutput
+ [], True,
+ '-r', '2', wc_dir,
+ extra_files=extra_files)
# Revert and update to check that conflict files are removed
svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
@@ -2375,7 +2350,7 @@ def file_matching_dir_prop_reject(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, True)
+ check_props=True)
def pristine_props_listed(sbox):
"check if pristine properties are visible"
@@ -2597,7 +2572,7 @@ def almost_known_prop_names(sbox):
svntest.actions.set_prop('svn:foobar', 'x', iota_path,
"svn: E195011: 'svn:foobar'"
" is not a valid svn: property name;"
- " re-run with '--force' to set it")
+ " use '--force' to set it")
@Issue(3231)
def peg_rev_base_working(sbox):
@@ -2611,7 +2586,7 @@ def peg_rev_base_working(sbox):
sbox.simple_commit(message='r2')
svntest.actions.set_prop('cardinal', 'nine\n', sbox.ospath('iota'))
svntest.actions.run_and_verify_svn(['ninth\n'], [],
- 'propget', '--strict', 'ordinal',
+ 'propget', '--no-newline', 'ordinal',
sbox.ospath('iota') + '@BASE')
@Issue(4415)
@@ -2644,7 +2619,7 @@ def xml_unsafe_author(sbox):
# a single property value which skips creating the creator-displayname property
svntest.actions.run_and_verify_svn(['foo\bbar'], [],
'propget', '--revprop', '-r', '1',
- 'svn:author', '--strict', wc_dir)
+ 'svn:author', '--no-newline', wc_dir)
# Ensure a stable date
svntest.actions.run_and_verify_svn(None, [],
@@ -2728,8 +2703,7 @@ def dir_prop_conflict_details(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- '.*[Oo]ut of date.*',
- wc_dir)
+ '.*[Oo]ut of date.*')
expected_output = svntest.wc.State(wc_dir, {
'A' : Item(status=' C'),
@@ -2741,8 +2715,7 @@ def dir_prop_conflict_details(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None, 1,
- wc_dir)
+ check_props=True)
# The conflict properties file line was shown for previous versions, but the
# conflict source urls are new since 1.8.
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/relocate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/relocate_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/relocate_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/relocate_tests.py Wed Mar 4 15:56:18 2015
@@ -61,8 +61,7 @@ def relocate_deleted_missing_copied(sbox
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Remove A/B/F to create a missing entry
svntest.main.safe_rmtree(os.path.join(wc_dir, 'A', 'B', 'F'))
@@ -141,8 +140,7 @@ def relocate_deleted_missing_copied(sbox
status=' ', wc_rev='3', copied=None)
expected_status.remove('A/D2/G', 'A/D2/G/pi', 'A/D2/G/rho', 'A/D2/G/tau')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
#----------------------------------------------------------------------
@@ -245,8 +243,7 @@ def relocate_and_propset(sbox):
# Commit the deletion of gamma and verify.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now gamma should be marked as `deleted' under the hood, at
# revision 2. Meanwhile, A/D is still lagging at revision 1.
@@ -258,8 +255,7 @@ def relocate_and_propset(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- "[Oo]ut.of.date",
- wc_dir)
+ ".*[Oo]ut of date.*")
#----------------------------------------------------------------------
@@ -330,8 +326,7 @@ def relocate_with_switched_children(sbox
# This won't actually do a commit, because nothing should be modified.
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
# Check the URLs of various nodes.
info_output = {
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/resolve_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/resolve_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/resolve_tests.py Wed Mar 4 15:56:18 2015
@@ -303,9 +303,7 @@ def resolved_on_wc_root(sbox):
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None,
- wc)
+ expected_status)
# Go back to rev 1
expected_output = svntest.wc.State(wc, {
@@ -319,7 +317,7 @@ def resolved_on_wc_root(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'-r1', wc)
# Deletions so that the item becomes unversioned and
@@ -351,7 +349,7 @@ def resolved_on_wc_root(sbox):
expected_output,
expected_disk,
None,
- None, None, None, None, None, False,
+ [], False,
wc)
svntest.actions.run_and_verify_unquiet_status(wc, expected_status)
@@ -450,7 +448,7 @@ def resolved_on_deleted_item(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
wc)
# Create some conflicts...
@@ -469,9 +467,7 @@ def resolved_on_deleted_item(sbox):
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None,
- wc)
+ expected_status)
# Delete the paths in the second directory.
svntest.actions.run_and_verify_svn(None, [],
@@ -490,7 +486,7 @@ def resolved_on_deleted_item(sbox):
svntest.actions.run_and_verify_commit(wc,
expected_output,
expected_status,
- None,
+ [],
A2)
# Now merge A to A2, creating conflicts...
@@ -543,7 +539,7 @@ def resolved_on_deleted_item(sbox):
expected_mergeinfo_output,
expected_elision_output,
expected_disk, None, expected_skip,
- None, dry_run = False)
+ [], dry_run = False)
svntest.actions.run_and_verify_unquiet_status(A2, expected_status)
# Now resolve by recursing on the working copy root.
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/revert_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/revert_tests.py Wed Mar 4 15:56:18 2015
@@ -91,8 +91,7 @@ def revert_replacement_with_props(sbox,
expected_status.tweak('A/D/G/rho', wc_rev='2')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Bring wc into sync
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -303,8 +302,8 @@ def revert_reexpand_keyword(sbox):
# This commit fails because newfile2_path is missing, but only after
# we call svn_wc__internal_file_modified_p() on new_file.
- svntest.actions.run_and_verify_commit(wc_dir, None, None, "2' is scheduled"+
- " for addition, but is missing",
+ svntest.actions.run_and_verify_commit(wc_dir, None, None, ".*2' is scheduled"+
+ " for addition, but is missing.*",
newfile_path, newfile2_path,
'-m', "Shouldn't be committed")
@@ -339,7 +338,7 @@ def revert_replaced_file_without_props(s
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# delete file1
svntest.actions.run_and_verify_svn(None, [], 'rm', file1_path)
@@ -444,8 +443,7 @@ def revert_file_merge_replace_with_histo
# Commit rev 2
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# create new rho file
svntest.main.file_write(rho_path, "new rho\n")
@@ -463,7 +461,7 @@ def revert_file_merge_replace_with_histo
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None, None, wc_dir)
+ None)
# Update working copy
expected_output = svntest.wc.State(wc_dir, {})
@@ -713,8 +711,7 @@ def revert_replaced_with_history_file_1(
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# update the working copy
svntest.main.run_svn(None, 'up', wc_dir)
@@ -754,8 +751,7 @@ def revert_replaced_with_history_file_1(
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Verify the content of 'mu'
svntest.actions.run_and_verify_svn(text_r1, [], 'cat', mu_path)
@@ -821,8 +817,7 @@ def status_of_missing_dir_after_revert_r
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# copy A/D/G from A/B/E and commit
E_path = os.path.join(wc_dir, "A", "B", "E")
@@ -837,8 +832,7 @@ def status_of_missing_dir_after_revert_r
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# update the working copy
svntest.main.run_svn(None, 'up', wc_dir)
@@ -928,8 +922,7 @@ def revert_replaced_with_history_file_2(
expected_status.tweak('A/mu', status=' ', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -1170,8 +1163,7 @@ def revert_permissions_only(sbox):
expected_status.tweak('A/B/E/beta', wc_rev='2')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
os.chmod(sbox.ospath('A/B/E/alpha'), 0666) # not read-only
is_writable(sbox.ospath('A/B/E/alpha'))
@@ -1606,13 +1598,13 @@ def revert_obstructing_wc(sbox):
# Checkout wc as depth empty
svntest.actions.run_and_verify_checkout(sbox.repo_url, wc_dir,
expected_output, expected_disk,
- None, None, None, None,
+ [],
'--depth', 'empty')
# And create an obstructing working copy as A
svntest.actions.run_and_verify_checkout(sbox.repo_url, wc_dir + '/A',
expected_output, expected_disk,
- None, None, None, None,
+ [],
'--depth', 'empty')
# Now try to fetch the entire wc, which will find an obstruction
@@ -1626,12 +1618,10 @@ def revert_obstructing_wc(sbox):
# A is not versioned but exists
})
- # Use expected_status.old_tree() to avoid doing an entries comparion
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
- expected_status.old_tree(),
- None, None, None,
- None, None, None,
+ expected_status,
+ [], False,
wc_dir, '--set-depth', 'infinity')
# Revert should do nothing (no local changes), and report the obstruction
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/schedule_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/schedule_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/schedule_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/schedule_tests.py Wed Mar 4 15:56:18 2015
@@ -495,8 +495,7 @@ def delete_missing(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Regression test for issue #854:
@@ -721,8 +720,7 @@ def replace_dir_delete_child(sbox):
svntest.actions.run_and_verify_commit(sbox.wc_dir,
expected_output,
- expected_status,
- None, sbox.wc_dir)
+ expected_status)
########################################################################
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/special_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/special_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/special_tests.py Wed Mar 4 15:56:18 2015
@@ -86,8 +86,7 @@ def general_symlink(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
## Now we should update to the previous version, verify that no
## symlink is present, then update back to HEAD and see if the symlink
@@ -133,7 +132,7 @@ def general_symlink(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
@SkipUnless(svntest.main.is_posix_os)
@@ -250,7 +249,7 @@ def copy_tree_with_symlink(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Copy H to H2
H_path = os.path.join(wc_dir, 'A', 'D', 'H')
H2_path = os.path.join(wc_dir, 'A', 'D', 'H2')
@@ -297,7 +296,7 @@ def replace_symlink_with_file(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Now replace the symlink with a normal file and try to commit, we
@@ -350,7 +349,7 @@ def remove_symlink(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Now remove it
svntest.actions.run_and_verify_svn(None, [], 'rm', newfile_path)
@@ -366,7 +365,7 @@ def remove_symlink(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -395,8 +394,7 @@ def merge_symlink_into_file(sbox):
'A/Dprime/gamma' : Item(verb='Deleting'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None, None,
- wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
# Commit a symlink in its place
linktarget_path = os.path.join(wc_dir, 'linktarget')
@@ -407,8 +405,7 @@ def merge_symlink_into_file(sbox):
'A/Dprime/gamma' : Item(verb='Adding'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None, None,
- wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
# merge the creation of the symlink into the original directory
svntest.main.run_svn(None,
@@ -430,8 +427,7 @@ def merge_symlink_into_file(sbox):
'A/D/gamma' : Item(verb='Replacing'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None, None,
- wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
@@ -460,8 +456,7 @@ def merge_file_into_symlink(sbox):
'A/Dprime/gamma' : Item(verb='Deleting'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None, None,
- wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
# Commit a symlink in its place
linktarget_path = os.path.join(wc_dir, 'linktarget')
@@ -472,8 +467,7 @@ def merge_file_into_symlink(sbox):
'A/Dprime/gamma' : Item(verb='Adding'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None, None,
- wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
svntest.main.file_write(gamma_path, 'changed file', 'w+')
@@ -481,8 +475,7 @@ def merge_file_into_symlink(sbox):
'A/D/gamma' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None, None,
- wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
# ok, now merge the change to the file into the symlink we created, this
# gives us a weird error
@@ -498,7 +491,8 @@ def checkout_repo_with_symlinks(sbox):
svntest.actions.load_repo(sbox, os.path.join(os.path.dirname(sys.argv[0]),
'special_tests_data',
- 'symlink.dump'))
+ 'symlink.dump'),
+ create_wc=False)
expected_output = svntest.wc.State(sbox.wc_dir, {
'from': Item(status='A '),
@@ -564,7 +558,8 @@ def checkout_repo_with_unknown_special_t
svntest.actions.load_repo(sbox, os.path.join(os.path.dirname(sys.argv[0]),
'special_tests_data',
- 'bad-special-type.dump'))
+ 'bad-special-type.dump'),
+ create_wc=False)
expected_output = svntest.wc.State(sbox.wc_dir, {
'special': Item(status='A '),
@@ -604,10 +599,10 @@ def replace_symlink_with_dir(sbox):
expected_output = svntest.wc.State(wc_dir, {
})
- error_re_string = 'E145001: (Entry|Node).*has.*changed (special|kind)'
+ error_re_string = '.*E145001: (Entry|Node).*has.*changed (special|kind).*'
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, error_re_string, wc_dir)
+ None, error_re_string)
# test for issue #1808: svn up deletes local symlink that obstructs
# versioned file
@@ -705,7 +700,7 @@ def propvalue_normalized(sbox):
# Property value should be SVN_PROP_BOOLEAN_TRUE
expected_propval = ['*']
svntest.actions.run_and_verify_svn(expected_propval, [],
- 'propget', '--strict', 'svn:special',
+ 'propget', '--no-newline', 'svn:special',
iota2_path)
# Commit and check again.
@@ -717,12 +712,11 @@ def propvalue_normalized(sbox):
'iota2' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
svntest.main.run_svn(None, 'update', wc_dir)
svntest.actions.run_and_verify_svn(expected_propval, [],
- 'propget', '--strict', 'svn:special',
+ 'propget', '--no-newline', 'svn:special',
iota2_path)
@@ -766,7 +760,7 @@ def symlink_destination_change(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Modify the symlink to point somewhere else
os.remove(newfile_path)
@@ -938,8 +932,7 @@ def update_symlink(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@Issue(4091)
@@ -1181,8 +1174,7 @@ def incoming_symlink_changes(sbox):
's-in-place' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, None, None,
- wc_dir)
+ expected_output, None)
# r4
svntest.main.run_svnmucc('propdel', 'svn:special',
@@ -1213,7 +1205,6 @@ def incoming_symlink_changes(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None,
check_props=True)
# Update back to r2, to prepare some local changes
@@ -1230,8 +1221,7 @@ def incoming_symlink_changes(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None,
- True,
+ [], True,
wc_dir, '-r', '2')
# Ok, now add a property on all of them to make future symlinkness changes
@@ -1255,8 +1245,7 @@ def incoming_symlink_changes(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
#----------------------------------------------------------------------
@Issue(4479)
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/stat_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/stat_tests.py Wed Mar 4 15:56:18 2015
@@ -107,7 +107,7 @@ def status_update_with_nested_adds(sbox)
# Commit.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Now we go to the backup working copy, still at revision 1.
# We will run 'svn st -u', and make sure that newdir/newfile is reported
@@ -735,7 +735,7 @@ use-commit-times = yes
expected_status = svntest.actions.get_virginal_state(other_wc, 1)
svntest.actions.run_and_verify_update(other_wc, expected_output,
expected_disk, expected_status,
- None, None, None, None, None, False,
+ [], False,
other_wc, '--config-dir', config_dir)
iota_text_timestamp = get_text_timestamp(other_iota_path)
if (iota_text_timestamp[17] != ':' or
@@ -1111,7 +1111,7 @@ def inconsistent_eol(sbox):
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Make the eol style inconsistent and verify that status says nothing.
svntest.main.file_write(iota_path, "line 1\nline 2\r\n", "wb")
@@ -1144,8 +1144,7 @@ def status_update_with_incoming_props(sb
# Commit the working copy
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create expected trees for an update to revision 1.
expected_output = svntest.wc.State(wc_dir, {
@@ -1160,7 +1159,7 @@ def status_update_with_incoming_props(sb
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1,
+ [], True,
'-r', '1', wc_dir)
# Can't use run_and_verify_status here because the out-of-date
@@ -1248,8 +1247,7 @@ def status_update_verbose_with_incoming_
# Commit the working copy
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create expected trees for an update to revision 1.
expected_output = svntest.wc.State(wc_dir, {
@@ -1265,7 +1263,7 @@ def status_update_verbose_with_incoming_
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1,
+ [], True,
'-r', '1', wc_dir)
# Can't use run_and_verify_status here because the out-of-date
@@ -1326,8 +1324,7 @@ def status_nonrecursive_update(sbox):
expected_status.tweak('A/D/gamma', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create expected trees for an update to revision 1.
expected_output = svntest.wc.State(wc_dir, {
@@ -1342,7 +1339,7 @@ def status_nonrecursive_update(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 0,
+ [], False,
'-r', '1', wc_dir)
# Check the remote status of folder A (non-recursively)
@@ -1382,8 +1379,7 @@ def change_files_and_commit(wc_dir, file
expected_status.tweak(file, wc_rev=commitrev, status=' ')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
def status_depth_local(sbox):
"run 'status --depth=X' with local changes"
@@ -2180,6 +2176,96 @@ def status_move_missing_direct_base(sbox
svntest.actions.run_and_verify_svn(expected_output, [], 'status',
sbox.ospath('Q/ZB/E'), '--depth', 'empty')
+def status_missing_conflicts(sbox):
+ "status missing certain conflicts"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ sbox.simple_propset('q', 'r', 'A/B/E/alpha', 'A/B/E/beta')
+ sbox.simple_commit()
+
+ sbox.simple_move('A/B/E/alpha', 'alpha')
+ sbox.simple_move('A/B/E/beta', 'beta')
+
+ sbox.simple_rm('A/B/E')
+
+ sbox.simple_update('A/B/E', revision=1)
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('A/B/E', status='D ', treeconflict='C', wc_rev=1)
+ expected_status.tweak('A/B/E/alpha', status='D ', treeconflict='C', wc_rev=1,
+ moved_to='alpha')
+ expected_status.tweak('A/B/E/beta', status='D ', treeconflict='C', wc_rev=1,
+ moved_to='beta')
+ expected_status.add({
+ 'alpha' : Item(status='A ', copied='+', moved_from='A/B/E/alpha', wc_rev='-'),
+ 'beta' : Item(status='A ', copied='+', moved_from='A/B/E/beta', wc_rev='-')
+ })
+
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ expected_info = [
+ {
+ 'Tree conflict': 'local file moved away, incoming file edit upon update.*'
+ },
+ {
+ 'Tree conflict': 'local file moved away, incoming file edit upon update.*'
+ }
+ ]
+ svntest.actions.run_and_verify_info(expected_info,
+ sbox.ospath('A/B/E/alpha'),
+ sbox.ospath('A/B/E/beta'))
+
+ svntest.actions.run_and_verify_svn(None, [],
+ 'resolve', '--accept=mine-conflict',
+ '--depth=empty', sbox.ospath('A/B/E'))
+ expected_status.tweak('A/B/E', treeconflict=None)
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # Now replace with directory
+ sbox.simple_mkdir('A/B/E')
+ expected_status.tweak('A/B/E', status='R ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ svntest.actions.run_and_verify_info(expected_info,
+ sbox.ospath('A/B/E/alpha'),
+ sbox.ospath('A/B/E/beta'))
+
+ #Recreate scenario for file
+ sbox.simple_rm('A/B/E', 'alpha', 'beta')
+ svntest.actions.run_and_verify_svn(None, [],
+ 'revert', '-R', sbox.ospath('A/B/E'))
+
+ sbox.simple_update('A/B/E', revision=2)
+
+ sbox.simple_move('A/B/E/alpha', 'alpha')
+ sbox.simple_move('A/B/E/beta', 'beta')
+
+ sbox.simple_rm('A/B/E')
+ sbox.simple_update('A/B/E', revision=1)
+ svntest.actions.run_and_verify_svn(None, [],
+ 'resolve', '--accept=mine-conflict',
+ '--depth=empty', sbox.ospath('A/B/E'))
+
+ sbox.simple_append('A/B/E', 'something')
+ expected_status.tweak('A/B/E', status='D ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ sbox.simple_add('A/B/E')
+
+ # In the entries world A/B/E doesn't have children..
+ expected_status.tweak('A/B/E', status='R ', entry_kind='file')
+
+ # Tree conflicts still in db
+ svntest.actions.run_and_verify_info(expected_info,
+ sbox.ospath('A/B/E/alpha'),
+ sbox.ospath('A/B/E/beta'))
+
+ # But not in status!
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+
+
+
########################################################################
# Run the tests
@@ -2230,6 +2316,7 @@ test_list = [ None,
status_path_handling,
status_move_missing_direct,
status_move_missing_direct_base,
+ status_missing_conflicts,
]
if __name__ == '__main__':
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnauthz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnauthz_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnauthz_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnauthz_tests.py Wed Mar 4 15:56:18 2015
@@ -128,9 +128,8 @@ def svnauthz_validate_repo_test(sbox):
expected_status.add({
'A/authz' : Item(status=' ', wc_rev=2),
})
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
# Valid authz url (file stored in repo)
authz_url = repo_url + '/A/authz'
@@ -174,9 +173,8 @@ def svnauthz_validate_txn_test(sbox):
expected_status.add({
'A/authz' : Item(status=' ', wc_rev=2),
})
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
expected_data = ['Exit 0\n']
verify_logfile(logfilepath, expected_data)
@@ -184,9 +182,8 @@ def svnauthz_validate_txn_test(sbox):
svntest.main.file_append(authz_path, 'x')
expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')})
expected_status.tweak('A/authz', status=' ', wc_rev=3)
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
expected_data = svntest.verify.RegexOutput(".*?Error parsing authz file: '.*?'",
match_all=False)
verify_logfile(logfilepath, expected_data, delete_log=False)
@@ -201,7 +198,7 @@ def svnauthz_validate_txn_test(sbox):
svntest.main.file_append(authz_path, 'x')
expected_status.tweak('A/authz', status=' ', wc_rev=4)
if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
+ expected_status):
raise svntest.Failure
expected_data = svntest.verify.ExpectedOutput("Exit 2\n", match_all=False)
verify_logfile(logfilepath, expected_data)
@@ -279,7 +276,7 @@ def svnauthz_accessof_repo_test(sbox):
'A/authz' : Item(status=' ', wc_rev=2),
})
if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
+ expected_status):
raise svntest.Failure
# Anonymous access with no path, and no repository should be rw
@@ -412,9 +409,8 @@ def svnauthz_accessof_groups_repo_test(s
'A/groups' : Item(status=' ', wc_rev=2),
})
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
# Anonymous access with no path, and no repository should be no
# since it returns the highest level of access granted anywhere.
@@ -628,9 +624,8 @@ def svnauthz_accessof_is_repo_test(sbox)
expected_status.add({
'A/authz' : Item(status=' ', wc_rev=2),
})
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
# Test an invalid --is option, should get an error message and exit code
# of 2.
@@ -753,9 +748,8 @@ def svnauthz_accessof_is_repo_test(sbox)
svntest.main.file_append(authz_path, "x\n")
expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')})
expected_status.tweak('A/authz', wc_rev=3)
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
# Check that --is returns 1 when the syntax is invalid with a url.
expected_out = svntest.verify.RegexOutput(
@@ -797,9 +791,8 @@ def svnauthz_accessof_txn_test(sbox):
expected_status.add({
'A/authz' : Item(status=' ', wc_rev=2),
})
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
expected_data = ['Exit 0\n']
verify_logfile(logfilepath, expected_data)
@@ -812,18 +805,16 @@ def svnauthz_accessof_txn_test(sbox):
expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')})
expected_status.tweak('A/authz', status=' ', wc_rev=3)
svntest.main.file_append(authz_path, "groucho = r\n")
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
expected_data = svntest.verify.ExpectedOutput('Exit 3\n', match_all=False)
verify_logfile(logfilepath, expected_data)
# break the authz file with a non-existent group and check for an exit 1.
expected_status.tweak('A/authz', status=' ', wc_rev=4)
svntest.main.file_append(authz_path, "@friends = rw\n")
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
expected_data = svntest.verify.ExpectedOutput('Exit 1\n', match_all=False)
verify_logfile(logfilepath, expected_data)
@@ -831,9 +822,8 @@ def svnauthz_accessof_txn_test(sbox):
expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Deleting')})
expected_status.remove('A/authz')
svntest.main.run_svn(None, 'rm', authz_path)
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
expected_data = svntest.verify.ExpectedOutput('Exit 2\n', match_all=False)
verify_logfile(logfilepath, expected_data)
@@ -887,9 +877,8 @@ def svnauthz_compat_mode_repo_test(sbox)
expected_status.add({
'A/authz' : Item(status=' ', wc_rev=2),
})
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
svntest.actions.run_and_verify_svnauthz(None, None, 0, True,
authz_url)
@@ -897,9 +886,8 @@ def svnauthz_compat_mode_repo_test(sbox)
svntest.main.file_append(authz_path, "x\n")
expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')})
expected_status.tweak('A/authz', status=' ', wc_rev=3)
- if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir):
- raise svntest.Failure
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output,
+ expected_status)
svntest.actions.run_and_verify_svnauthz(None, None, 1, True,
authz_path)
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnlook_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnlook_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnlook_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnlook_tests.py Wed Mar 4 15:56:18 2015
@@ -95,9 +95,7 @@ def test_misc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# give the repo a new UUID
uuid = "01234567-89ab-cdef-89ab-cdef01234567"
@@ -234,9 +232,7 @@ def delete_file_in_moved_dir(sbox):
### in order to get this commit working again.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
exit_code, output, errput = svntest.main.run_svnlook("dirs-changed",
repo_dir)
@@ -383,9 +379,7 @@ def changed_copy_info(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
exit_code, output, errput = svntest.main.run_svnlook("changed", repo_dir)
if errput:
@@ -481,9 +475,7 @@ def diff_ignore_whitespace(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Check the output of 'svnlook diff -x --ignore-space-change' on mu.
# It should not print anything.
@@ -536,9 +528,7 @@ def diff_ignore_eolstyle(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Grab the diff
exit_code, expected_output, err = svntest.actions.run_and_verify_svn(
@@ -705,7 +695,6 @@ fp.close()"""
"Properties on '/A':\n",
' bogus_prop\n',
' svn:log\n', ' svn:author\n',
- ' svn:check-locks\n', # internal prop, not really expected
' bogus_rev_prop\n',
' svn:date\n',
' svn:txn-client-compat-version\n',
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnmucc_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnmucc_tests.py?rev=1664059&r1=1664058&r2=1664059&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnmucc_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnmucc_tests.py Wed Mar 4 15:56:18 2015
@@ -345,7 +345,7 @@ def propset_root_internal(sbox, target):
'propset', 'foo', 'bar',
target)
svntest.actions.run_and_verify_svn('bar', [],
- 'propget', '--strict', 'foo',
+ 'propget', '--no-newline', 'foo',
target)
## propdel on ^/
@@ -355,7 +355,7 @@ def propset_root_internal(sbox, target):
target)
svntest.actions.run_and_verify_svn([],
'.*W200017: Property.*not found',
- 'propget', '--strict', 'foo',
+ 'propget', '--no-newline', 'foo',
target)
@Issues(3663)