You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/02/10 12:41:59 UTC
svn commit: r1658686 [13/19] - in /subversion/branches/pin-externals: ./
build/generator/ build/generator/templates/ subversion/bindings/swig/
subversion/include/ subversion/libsvn_client/ subversion/libsvn_fs_fs/
subversion/libsvn_fs_x/ subversion/lib...
Modified: subversion/branches/pin-externals/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/merge_tree_conflict_tests.py Tue Feb 10 11:41:57 2015
@@ -61,7 +61,7 @@ def delete_file_and_dir(sbox):
B2_path = os.path.join(wc_dir, 'A', 'B2')
B_url = sbox.repo_url + '/A/B'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'copy', B_path, B2_path)
expected_output = wc.State(wc_dir, {
@@ -85,7 +85,7 @@ def delete_file_and_dir(sbox):
# Rev 3 delete E and lambda from B
E_path = os.path.join(B_path, 'E')
lambda_path = os.path.join(B_path, 'lambda')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'delete', E_path, lambda_path)
expected_output = wc.State(wc_dir, {
@@ -106,7 +106,7 @@ def delete_file_and_dir(sbox):
# Local mods in B2
B2_E_path = os.path.join(B2_path, 'E')
B2_lambda_path = os.path.join(B2_path, 'lambda')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'foo_val',
B2_E_path, B2_lambda_path)
expected_status.tweak(
@@ -180,10 +180,10 @@ def merge_catches_nonexistent_target(sbo
Q_url = sbox.repo_url + '/A/D/Q'
# Copy dir A/D/G to A/D/Q
- svntest.actions.run_and_verify_svn(None, None, [], 'cp', G_path, Q_path)
+ svntest.actions.run_and_verify_svn(None, [], 'cp', G_path, Q_path)
svntest.main.file_append(newfile_path, 'This is newfile.\n')
- svntest.actions.run_and_verify_svn(None, None, [], 'add', newfile_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', newfile_path)
# Add newfile to dir G, creating r2.
expected_output = wc.State(wc_dir, {
@@ -284,21 +284,21 @@ def merge_tree_deleted_in_target(sbox):
# Copy B to I, creating r1.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', B_url, I_url, '-m', 'rev 2')
# Change some files, creating r2.
svntest.main.file_append(alpha_path, 'A change to alpha.\n')
svntest.main.file_append(os.path.join(B_path, 'lambda'), 'change lambda.\n')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'rev 3', B_path)
# Remove E, creating r3.
E_url = sbox.repo_url + '/A/I/E'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', E_url, '-m', 'rev 4')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', os.path.join(wc_dir,'A'))
expected_output = wc.State(I_path, {
@@ -354,7 +354,7 @@ def three_way_merge_add_of_existing_bina
# Create a branch of A, creating revision 2.
A_url = sbox.repo_url + "/A"
branch_A_url = sbox.repo_url + "/copy-of-A"
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
"cp",
A_url, branch_A_url,
"-m", "Creating copy-of-A")
@@ -447,16 +447,16 @@ def merge_added_dir_to_deleted_in_target
I_path = os.path.join(wc_dir, 'A', 'I')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', B_url, I_url, '-m', 'rev 2')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', F_url, '-m', 'rev 3')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'rev 4', J_url)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', os.path.join(wc_dir,'A'))
expected_output = wc.State(I_path, {
@@ -583,7 +583,7 @@ def mergeinfo_recording_in_skipped_merge
wc_status, None, wc_dir)
# Delete A_COPY/B/E
- svntest.actions.run_and_verify_svn(None, None, [], 'rm',
+ svntest.actions.run_and_verify_svn(None, [], 'rm',
A_COPY_B_E_path)
# Merge /A to /A_COPY ie., r1 to r4
@@ -673,7 +673,7 @@ def del_differing_file(sbox):
target = 'A/D/G2'
svn_copy(s_rev_orig, source, target)
svntest.main.file_append(target+"/tau", "An extra line in the target.\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+ svntest.actions.run_and_verify_svn(None, [], 'propset',
'newprop', 'v', target+"/pi")
dir_D = os.path.join('A','D')
@@ -693,7 +693,7 @@ def del_differing_file(sbox):
target = 'A/D/G3'
svn_copy(s_rev_orig, source, target)
svntest.main.file_append(target+"/tau", "An extra line in the target.\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+ svntest.actions.run_and_verify_svn(None, [], 'propset',
'newprop', 'v', target+"/pi")
sbox.simple_commit(target)
@@ -728,18 +728,18 @@ def tree_conflicts_and_obstructions(sbox
br_alpha_moved = os.path.join(branch_path, 'alpha-moved')
# Create a branch
- svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+ svntest.actions.run_and_verify_svn(None, [], 'cp',
trunk_url,
sbox.repo_url + '/branch',
'-m', "Creating the Branch")
- svntest.actions.run_and_verify_svn(None, None, [], 'mv',
+ svntest.actions.run_and_verify_svn(None, [], 'mv',
trunk_url + '/alpha',
trunk_url + '/alpha-moved',
'-m', "Move alpha to alpha-moved")
# Update to revision 2.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'update', wc_dir)
svntest.main.file_write(br_alpha_moved, "I am blocking myself from trunk\n")
@@ -1461,7 +1461,7 @@ def merge_replace_setup(sbox):
'Committed revision 2.\n',
]
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', url_A,
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'cp', url_A,
url_branch, '-m', 'copy log')
# svn up
@@ -1551,7 +1551,7 @@ def merge_replace_setup(sbox):
'D ' + branch_D_H + '\n',
])
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'delete',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'delete',
branch_mu, branch_B_E, branch_D_G_pi, branch_D_H)
# svn ci
@@ -1589,33 +1589,33 @@ def merge_replace_setup(sbox):
# svn add branch/mu
expected_stdout = ['A ' + branch_mu + '\n']
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'add',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'add',
branch_mu)
# dir-with-dir
# svn mkdir branch/B/E
expected_stdout = ['A ' + branch_B_E + '\n']
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
branch_B_E)
# svn ps propname propval branch/B/E
expected_stdout = ["property 'propname' set on '" + branch_B_E + "'\n"]
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'propname', 'propval', branch_B_E)
# file-with-dir
# svn mkdir branch/D/G/pi
expected_stdout = ['A ' + branch_D_G_pi + '\n']
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
branch_D_G_pi)
# svn ps propname propval branch/D/G/pi
expected_stdout = ["property 'propname' set on '" + branch_D_G_pi + "'\n"]
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'propname', 'propval', branch_D_G_pi)
# dir-with-file
@@ -1625,7 +1625,7 @@ def merge_replace_setup(sbox):
# svn add branch/D/H
expected_stdout = ['A ' + branch_D_H + '\n']
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'add',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'add',
branch_D_H)
# svn ci
@@ -1686,7 +1686,7 @@ def merge_replace_causes_tree_conflict(s
# svn ps propname otherpropval A/B/E
expected_stdout = ["property 'propname' set on '" + A_B_E + "'\n"]
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'propname', 'otherpropval', A_B_E)
# echo modified > A/D/G/pi
@@ -1695,7 +1695,7 @@ def merge_replace_causes_tree_conflict(s
# svn ps propname propval A/D/H
expected_stdout = ["property 'propname' set on '" + A_D_H + "'\n"]
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
'propname', 'propval', A_D_H)
# svn merge $URL/A $URL/branch A
@@ -1709,7 +1709,7 @@ def merge_replace_causes_tree_conflict(s
' U ' + A + '\n',
], target=A, two_url=True, tree_conflicts=4)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
url_A, url_branch, A)
# svn st
@@ -1775,7 +1775,7 @@ def merge_replace_causes_tree_conflict2(
'D ' + os.path.join(A_D_H, 'psi') + '\n',
'D ' + A_D_H + '\n',
])
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'delete',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'delete',
A_mu, A_B_E, A_D_G_pi, A_D_H)
expected_status.tweak('A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/D/G/pi',
'A/D/H', 'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi',
@@ -1795,7 +1795,7 @@ def merge_replace_causes_tree_conflict2(
" U " + A_mu + "\n", # mergeinfo -> 'RM' status
], target=A, two_url=True, tree_conflicts=1)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
url_A, url_branch, A, '--depth=files')
# New mergeinfo describing the merge.
expected_status.tweak('A', status=' M')
@@ -1815,7 +1815,7 @@ def merge_replace_causes_tree_conflict2(
" U " + A_B + "\n", # mergeinfo
], target=A_B, two_url=True, tree_conflicts=1)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
url_A_B, url_branch_B, A_B)
# New mergeinfo describing the merge.
expected_status.tweak('A/B', status=' M')
@@ -1835,7 +1835,7 @@ def merge_replace_causes_tree_conflict2(
" U " + A_D + "\n", # mergeinfo
], target=A_D, two_url=True, tree_conflicts=1)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
'--depth=immediates', url_A_D, url_branch_D, A_D)
# New mergeinfo describing the merge.
expected_status.tweak('A/D', 'A/D/G', status=' M')
@@ -1855,7 +1855,7 @@ def merge_replace_causes_tree_conflict2(
" U " + A_D_G + "\n", # mergeinfo
], target=A_D_G, two_url=True, tree_conflicts=1)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
url_A_D_G, url_branch_D_G, A_D_G)
# New mergeinfo describing the merge.
expected_status.tweak('A/D/G', status=' M')
@@ -1876,7 +1876,7 @@ def merge_replace_causes_tree_conflict2(
'|( \>.*)'
tree_conflicted_path = [A_B_E, A_mu, A_D_G_pi, A_D_H]
for path in tree_conflicted_path:
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'st',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'st',
'--depth=empty', path)
#----------------------------------------------------------------------
@@ -1894,25 +1894,25 @@ def merge_replace_on_del_fails(sbox):
C_branch_path = os.path.join(wc_dir, 'branch', 'C')
# r2 - Copy ^/A to ^/branch
- svntest.actions.run_and_verify_svn(None, None, [], 'copy',
+ svntest.actions.run_and_verify_svn(None, [], 'copy',
sbox.repo_url + '/A',
sbox.repo_url + '/branch',
'-m', 'Create a branch')
# r3 - Replace A/C
- svntest.actions.run_and_verify_svn(None, None, [], 'del', C_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', C_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ svntest.actions.run_and_verify_svn(None, [], 'del', C_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', C_path)
+ svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'Replace A/C', wc_dir)
# r4 - Delete branch/C
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'del', C_branch_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'del', C_branch_path)
+ svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'Delete branch/C', wc_dir)
# Sync merge ^/A to branch
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_stdout = expected_merge_output([[2,4]], [
' C ' + C_branch_path + '\n', # merge
' U ' + branch_path + '\n', # mergeinfo
@@ -1946,7 +1946,7 @@ def merge_replace_on_del_fails(sbox):
# svn: E155010: The node 'C:\SVN\src-trunk\Debug\subversion\tests\
# cmdline\svn-test-work\working_copies\merge_tree_conflict_tests-24\
# branch\C' was not found.
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
sbox.repo_url + '/A', branch_path)
########################################################################
Modified: subversion/branches/pin-externals/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/mergeinfo_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/mergeinfo_tests.py Tue Feb 10 11:41:57 2015
@@ -89,7 +89,7 @@ def mergeinfo(sbox):
sbox.simple_update()
# Dummy up some mergeinfo.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ps', SVN_PROP_MERGEINFO, '/A:3',
sbox.ospath('A2'))
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
@@ -183,14 +183,14 @@ def mergeinfo_on_unknown_url(sbox):
# remove a path from the repo and commit.
iota_path = os.path.join(wc_dir, 'iota')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', iota_path)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, [], 'rm', iota_path)
+ svntest.actions.run_and_verify_svn(None, [],
"ci", wc_dir, "-m", "log message")
url = sbox.repo_url + "/iota"
expected_err = adjust_error_for_server_version(".*File not found.*iota.*|"
".*iota.*path not found.*")
- svntest.actions.run_and_verify_svn("", None, expected_err,
+ svntest.actions.run_and_verify_svn(None, expected_err,
"mergeinfo", "--show-revs", "eligible",
url, wc_dir)
@@ -213,11 +213,10 @@ def non_inheritable_mergeinfo(sbox):
# Update the WC, then merge r4 from A to A_COPY and r6 from A to A_COPY
# at --depth empty and commit the merges as r7.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(6), [], 'up',
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(6), [], 'up',
wc_dir)
expected_status.tweak(wc_rev=6)
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[4]],
['U ' + rho_COPY_path + '\n',
' U ' + A_COPY_path + '\n',]),
@@ -225,7 +224,6 @@ def non_inheritable_mergeinfo(sbox):
sbox.repo_url + '/A',
A_COPY_path)
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[6]], ' G ' + A_COPY_path + '\n'),
[], 'merge', '-c6',
sbox.repo_url + '/A',
@@ -239,7 +237,7 @@ def non_inheritable_mergeinfo(sbox):
expected_status, None, wc_dir)
# Update the WC a last time to ensure full inheritance.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [], 'up',
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [], 'up',
wc_dir)
# Despite being non-inheritable, r6 should still show as merged to A_COPY
@@ -296,26 +294,25 @@ def recursive_mergeinfo(sbox):
nu2_path = os.path.join(wc_dir, "A2", "C", "nu2")
# Rename A to A2 in r7.
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(6), [], 'up', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(6), [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [],
'ren', A_path, A2_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', wc_dir, '-m', 'rename A to A2')
# Add the files A/B/F/nu and A/C/nu2 and commit them as r8.
svntest.main.file_write(nu_path, "A new file.\n")
svntest.main.file_write(nu2_path, "Another new file.\n")
svntest.main.run_svn(None, "add", nu_path, nu2_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', wc_dir, '-m', 'Add 2 new files')
# Do several merges to create varied subtree mergeinfo
# Merge r4 from A2 to A_COPY at depth empty
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(8), [], 'up',
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [], 'up',
wc_dir)
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[4]], ' U ' + A_COPY_path + '\n'),
[], 'merge', '-c4', '--depth', 'empty',
sbox.repo_url + '/A2',
@@ -323,7 +320,6 @@ def recursive_mergeinfo(sbox):
# Merge r6 from A2/D/H to A_COPY/D/H
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[6]],
['U ' + omega_COPY_path + '\n',
' G ' + H_COPY_path + '\n']),
@@ -333,7 +329,6 @@ def recursive_mergeinfo(sbox):
# Merge r5 from A2 to A_COPY
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
['U ' + beta_COPY_path + '\n',
' G ' + A_COPY_path + '\n',
@@ -347,7 +342,6 @@ def recursive_mergeinfo(sbox):
# Reverse merge -r5 from A2/C to A_COPY/C leaving empty mergeinfo on
# A_COPY/C.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[-5]],
' G ' + C_COPY_path + '\n'),
[], 'merge', '-c-5',
@@ -355,7 +349,6 @@ def recursive_mergeinfo(sbox):
# Merge r8 from A2/B/F to A_COPY/B/F
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[8]],
['A ' + nu_COPY_path + '\n',
' G ' + F_COPY_path + '\n']),
@@ -364,9 +357,9 @@ def recursive_mergeinfo(sbox):
F_COPY_path)
# Commit everything this far as r9
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', wc_dir, '-m', 'Many merges')
- svntest.actions.run_and_verify_svn(None, exp_noop_up_out(9), [], 'up',
+ svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [], 'up',
wc_dir)
# Test svn mergeinfo -R / --depth infinity.
@@ -461,26 +454,24 @@ def mergeinfo_on_pegged_wc_path(sbox):
#
# r7 - Merge -c3,6 from A to A_COPY.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[3],[6]],
['U ' + psi_COPY_path + '\n',
'U ' + omega_COPY_path + '\n',
' U ' + A_COPY_path + '\n',
' G ' + A_COPY_path + '\n',]),
[], 'merge', '-c3,6', sbox.repo_url + '/A', A_COPY_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', wc_dir,
'-m', 'Merge r3 and r6')
# r8 - Merge -c5 from A to A_COPY.
svntest.actions.run_and_verify_svn(
- None,
expected_merge_output([[5]],
['U ' + beta_COPY_path + '\n',
' U ' + A_COPY_path + '\n']),
[], 'merge', '-c5', '--allow-mixed-revisions',
sbox.repo_url + '/A', A_COPY_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', wc_dir,
'-m', 'Merge r5')
@@ -574,19 +565,19 @@ def wc_target_inherits_mergeinfo_from_re
# Properties on 'A_COPY':
# svn:mergeinfo
# /A:7
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
sbox.repo_url + '/A/D/G/rho',
rho_COPY_path, '-c5')
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
sbox.repo_url + '/A',
A_COPY_path, '-c7')
- svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
'Cherrypicks to branch subtree and root',
wc_dir)
# Checkout a new wc rooted at ^/A_COPY/D.
subtree_wc = sbox.add_wc_path('D_COPY')
- svntest.actions.run_and_verify_svn(None, None, [], 'co',
+ svntest.actions.run_and_verify_svn(None, [], 'co',
sbox.repo_url + '/A_COPY/D',
subtree_wc)
@@ -622,10 +613,10 @@ def wc_target_inherits_mergeinfo_from_re
# source.
#
# In r9 make a change that effects two branches:
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
svntest.main.file_write(gamma_2_path, "New content.\n")
svntest.main.file_write(tau_path, "New content.\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
'Make changes under both A and A_COPY_2',
wc_dir)
@@ -640,10 +631,10 @@ def wc_target_inherits_mergeinfo_from_re
# Properties on 'A_COPY\D\G\rho':
# svn:mergeinfo
# /A/D/G/rho:5
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
sbox.repo_url + '/A_COPY_2',
A_COPY_path, '-c9')
- svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+ svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
'Merge r8 from A_COPY_2 to A_COPY',
wc_dir)
@@ -673,8 +664,8 @@ def wc_target_inherits_mergeinfo_from_re
'--show-revs', 'merged', '-R')
# Test while the target is the full WC and then with the subtree WC:
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', subtree_wc)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', subtree_wc)
test_svn_mergeinfo_4_way(D_COPY_path)
test_svn_mergeinfo_4_way(subtree_wc)
@@ -697,27 +688,27 @@ def natural_history_is_not_eligible_nor_
# r7 - Add a new file A/C/nu
svntest.main.file_write(nu_path, "This is the file 'nu'.\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', nu_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ svntest.actions.run_and_verify_svn(None, [], 'add', nu_path)
+ svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'Add a file', wc_dir)
# r8 - Sync merge ^/A to A_COPY
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
sbox.repo_url + '/A', A_COPY_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'Add a file', wc_dir)
# r9 - Modify the file added in r7
svntest.main.file_write(nu_path, "Modification to file 'nu'.\n")
- svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'Modify added file', wc_dir)
# r10 - Merge ^/A/C/nu to A_COPY/C/nu, creating subtree mergeinfo.
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
sbox.repo_url + '/A/C/nu', nu_COPY_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+ svntest.actions.run_and_verify_svn(None, [], 'ci',
'-m', 'Add a file', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# We've effectively merged everything from ^/A to A_COPY, check
# that svn mergeinfo -R agrees.
@@ -758,13 +749,13 @@ def noninheritable_mergeinfo_not_always_
svntest.main.run_svn(None, 'up', wc_dir)
# r4 - Merge r3 from ^/A to branch at depth=empty.
- svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
sbox.repo_url + '/A', branch_path,
'-c3', '--depth=empty')
# Forcibly set non-inheritable mergeinfo to replicate the pre-1.8 behavior,
# where prior to the fix for issue #4057, non-inheritable mergeinfo was
# unconditionally set for merges with shallow operational depths.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', SVN_PROP_MERGEINFO,
'/A:3*\n', branch_path)
svntest.main.run_svn(None, 'commit', '-m', 'shallow merge', wc_dir)
@@ -791,8 +782,7 @@ def mergeinfo_local_move(sbox):
wc_dir = sbox.wc_dir
sbox.simple_move('A', 'A2')
- svntest.actions.run_and_verify_svn(None,
- None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mergeinfo', sbox.repo_url + '/A',
sbox.ospath('A2'))
Modified: subversion/branches/pin-externals/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/move_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/move_tests.py Tue Feb 10 11:41:57 2015
@@ -182,8 +182,7 @@ def move_file_test(sbox, source, dest, m
resolve['disk'] = None
if 'revert_paths' in resolve:
revert_paths = resolve['revert_paths']
- svntest.actions.run_and_verify_svn('Resolve modification to source of move',
- resolve['output'], resolve['error'],
+ svntest.actions.run_and_verify_svn(resolve['output'], resolve['error'],
'resolve', '--accept', resolve_accept,
'-R', wc_dir)
@@ -246,11 +245,6 @@ def build_simple_file_move_tests(sbox, s
copied='+', wc_rev='-')})
mc['disk'] = test['up_disk'].copy()
mc['disk'].tweak(dest, contents="This is the file 'lambda'.\nmodified\n")
- # theirs-conflict doesn't work
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
# working breaks the move
working = {}
working['output'] = svntest.verify.ExpectedOutput(
@@ -263,7 +257,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -286,15 +280,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
test['up_status'].tweak(source, status='! ', treeconflict='C', wc_rev=None)
test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doen't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Doesn't say it broke the move it should.
working['output'] = svntest.verify.ExpectedOutput(
@@ -306,7 +296,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].remove(source)
working['disk'] = test['up_disk']
working['revert_paths'] = [dest_path]
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [dest_path, source_path]
tests.append(test)
@@ -331,15 +321,11 @@ def build_simple_file_move_tests(sbox, s
# XXX: Is entry_status=' ' really right here?
test['up_status'].tweak(source, status='! ', treeconflict='C', entry_status=' ')
test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Broke the move but doesn't notify that it does.
working['output'] = svntest.verify.ExpectedOutput(
@@ -350,7 +336,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].tweak(source, status='! ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -374,15 +360,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='D ', moved_to=dest)
test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
wc_rev='-', moved_from=source)})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Doesn't say what it did.
working['output'] = svntest.verify.ExpectedOutput(
@@ -394,7 +376,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -419,15 +401,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='D ', moved_to=dest)
test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
wc_rev='-', moved_from=source)})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
working['accept'] = 'working'
# XXX: Doesn't say what it did.
@@ -440,7 +418,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -488,15 +466,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='D ', moved_to=dest)
test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
wc_rev='-', moved_from=source)})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Doesn't say what it did.
working['output'] = svntest.verify.ExpectedOutput(
@@ -508,7 +482,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -532,15 +506,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='D ', moved_to=dest)
test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
wc_rev='-', moved_from=source)})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Doesn't say what it did.
working['output'] = svntest.verify.ExpectedOutput(
@@ -552,7 +522,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -576,15 +546,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='D ', moved_to=dest)
test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
wc_rev='-', moved_from=source)})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Didn't tell us what it did.
working['output'] = svntest.verify.ExpectedOutput(
@@ -596,7 +562,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -620,15 +586,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='D ', moved_to=dest)
test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
wc_rev='-', moved_from=source)})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Doesn't tell you what it did.
working['output'] = svntest.verify.ExpectedOutput(
@@ -640,7 +602,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -664,15 +626,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='D ', moved_to=dest)
test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
wc_rev='-', moved_from=source)})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
# XXX: Doesn't tell you what it did.
working['output'] = svntest.verify.ExpectedOutput(
@@ -684,7 +642,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].add({dest: Item(status='R ', moved_from=source,
copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -720,11 +678,6 @@ def build_simple_file_move_tests(sbox, s
copied='+', wc_rev='-')})
mc['disk'] = test['up_disk'].copy()
mc['disk'].tweak(dest, props={u'foo': u'bar'})
- # theirs-conflict doesn't work
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
working['output'] = svntest.verify.ExpectedOutput(
[
@@ -737,7 +690,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -773,11 +726,6 @@ def build_simple_file_move_tests(sbox, s
copied='+', wc_rev='-')})
mc['disk'] = test['up_disk'].copy()
mc['disk'].tweak(dest, props={u'foo': u'baz'})
- # theirs-conflict doesn't work
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
working['output'] = svntest.verify.ExpectedOutput(
[
@@ -790,7 +738,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -826,11 +774,6 @@ def build_simple_file_move_tests(sbox, s
copied='+', wc_rev='-')})
mc['disk'] = test['up_disk'].copy()
mc['disk'].tweak(dest, props={})
- # theirs-conflict doesn't work
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
working['output'] = svntest.verify.ExpectedOutput(
[
@@ -843,7 +786,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].tweak(source, status='D ')
working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
working['disk'] = test['up_disk']
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [source_path, dest_path]
tests.append(test)
@@ -870,15 +813,11 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].tweak(source, status='! ', treeconflict='C', wc_rev=None)
test['up_status'].add({dest: Item(status='R ', copied='+', wc_rev='-',
treeconflict='C')})
- # mine-conflict and theirs-conflict don't work.
+ # mine-conflict doesn't work.
mc = {}
mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
- tc = {}
- tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
- tc['status'] = test['up_status']
- tc['disk'] = test['up_disk']
working = {}
working['output'] = svntest.verify.ExpectedOutput(
"Resolved conflicted state of '%s'\n" % source_path, match_all=False
@@ -889,7 +828,7 @@ def build_simple_file_move_tests(sbox, s
working['status'].remove(source)
working['disk'] = test['up_disk']
working['revert_paths'] = [dest_path]
- test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+ test['resolves'] = {'mine-conflict': mc,
'working': working}
test['revert_paths'] = [dest_path, source_path]
tests.append(test)
@@ -904,7 +843,7 @@ def build_simple_file_move_func(sbox, so
# Setup the move function
def move_func(rev):
# execute the move
- svntest.actions.run_and_verify_svn(None, None, [], "move",
+ svntest.actions.run_and_verify_svn(None, [], "move",
source_path, dest_path)
if move_func.extra_mv_tests:
mv_status = svntest.actions.get_virginal_state(wc_dir, rev)
@@ -1098,7 +1037,7 @@ def property_merge(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
sbox.simple_update()
- svntest.actions.run_and_verify_svn("resolve failed", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'resolve',
'--accept=mine-conflict',
sbox.ospath('A/C'))
@@ -1209,7 +1148,7 @@ def move_missing(sbox):
# This move currently fails halfway between adding the dest and
# deleting the source
- svntest.actions.run_and_verify_svn(None, None, expected_err,
+ svntest.actions.run_and_verify_svn(None, expected_err,
'mv', sbox.ospath('A/D/G'),
sbox.ospath('R'))
@@ -1247,7 +1186,7 @@ def nested_replaces(sbox):
ospath = sbox.ospath
## r1: setup
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-U', repo_url,
'-m', 'r1: create tree',
'mkdir', 'A', 'mkdir', 'A/B', 'mkdir', 'A/B/C',
@@ -1335,7 +1274,7 @@ def nested_replaces(sbox):
]) + [
'^-', '^r2', '^-', '^Changed paths:',
])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'log', '-qvr2', repo_url)
## Test updating to r1.
@@ -1417,7 +1356,7 @@ def move_many_update_delete(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# And now create a tree conflict
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', sbox.repo_url + '/B',
'-m', '')
@@ -1450,7 +1389,7 @@ def move_many_update_add(sbox):
#svntest.actions.run_and_verify_status(wc_dir, expected_status)
# And now create a tree conflict
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', sbox.repo_url + '/B/A/A/BB',
'-m', '')
@@ -1481,7 +1420,7 @@ def move_many_update_add(sbox):
wc_dir, '--accept', 'mine-conflict')
# And another one
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', sbox.repo_url + '/C/A/A/BB',
'-m', '')
@@ -1564,17 +1503,17 @@ def move_to_from_external(sbox):
sbox.simple_propset('svn:externals', '^/A/D/G GG', '')
sbox.simple_update()
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'move',
sbox.ospath('GG/tau'),
sbox.ospath('tau'))
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'move',
sbox.ospath('iota'),
sbox.ospath('GG/tau'))
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'Commit both',
sbox.ospath(''),
sbox.ospath('GG'))
Modified: subversion/branches/pin-externals/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/patch_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/patch_tests.py Tue Feb 10 11:41:57 2015
@@ -1079,9 +1079,9 @@ def patch_remove_empty_dirs(sbox):
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
F_path = sbox.ospath('A/B/F')
- svntest.actions.run_and_verify_svn("Deleting F failed", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', F_path)
- svntest.actions.run_and_verify_svn("Update failed", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', wc_dir)
# We should be able to handle one path beeing missing.
@@ -1673,7 +1673,7 @@ def patch_no_svn_eol_style(sbox):
1) # dry-run
expected_output = ["Reverted '" + mu_path + "'\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(expected_output, [], 'revert', '-R', wc_dir)
def patch_with_svn_eol_style(sbox):
"patch target with svn:eol-style"
@@ -1788,7 +1788,7 @@ def patch_with_svn_eol_style(sbox):
1) # dry-run
expected_output = ["Reverted '" + mu_path + "'\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(expected_output, [], 'revert', '-R', wc_dir)
def patch_with_svn_eol_style_uncommitted(sbox):
"patch target with uncommitted svn:eol-style"
@@ -1897,7 +1897,7 @@ def patch_with_svn_eol_style_uncommitted
1) # dry-run
expected_output = ["Reverted '" + mu_path + "'\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'revert', '-R', wc_dir)
+ svntest.actions.run_and_verify_svn(expected_output, [], 'revert', '-R', wc_dir)
def patch_with_ignore_whitespace(sbox):
"ignore whitespace when patching"
@@ -4229,7 +4229,7 @@ def patch_change_symlink_target(sbox):
'U %s\n' % sbox.ospath('link'),
]
- svntest.actions.run_and_verify_svn(None, patch_output, [],
+ svntest.actions.run_and_verify_svn(patch_output, [],
'patch', patch_file_path, wc_dir)
# r3 - Store result
@@ -4248,7 +4248,7 @@ def patch_change_symlink_target(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
None, None, wc_dir)
- svntest.actions.run_and_verify_svn(None, patch_output, [],
+ svntest.actions.run_and_verify_svn(patch_output, [],
'patch', patch_file_path, wc_dir)
# TODO: when it passes, verify that the on-disk 'link' is correct ---
@@ -4357,7 +4357,7 @@ def patch_replace_dir_with_file_and_vv(s
'A %s\n' % sbox.ospath('iota'),
]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'patch', patch_file_path, sbox.wc_dir)
@Issue(4297)
@@ -4391,7 +4391,7 @@ def single_line_mismatch(sbox):
'> rejected hunk @@ -1,1 +1,1 @@\n',
] + svntest.main.summary_of_conflicts(text_conflicts=1)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'patch', patch_file_path, wc_dir)
@Issue(3644)
@@ -4442,7 +4442,7 @@ def patch_empty_file(sbox):
]
# Current result: lf.txt patched ok, new created, empty succeeds with offset.
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'patch', patch_file_path, wc_dir)
expected_disk = svntest.main.greek_state.copy()
@@ -4556,7 +4556,7 @@ def patch_apply_no_fuz(sbox):
]
# Current result: lf.txt patched ok, new created, empty succeeds with offset.
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'patch', patch_path, wc_dir)
if not filecmp.cmp(sbox.ospath('test.txt'), sbox.ospath('test_v2.txt')):