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 2016/02/25 13:31:11 UTC
svn commit: r1732292 -
/subversion/trunk/subversion/tests/cmdline/move_tests.py
Author: stsp
Date: Thu Feb 25 12:31:11 2016
New Revision: 1732292
URL: http://svn.apache.org/viewvc?rev=1732292&view=rev
Log:
Follow-up to r1732291:
* subversion/tests/cmdline/move_tests.py
(build_simple_file_move_tests): Adjust expected error for failing --accept mc.
Modified:
subversion/trunk/subversion/tests/cmdline/move_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1732292&r1=1732291&r2=1732292&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Thu Feb 25 12:31:11 2016
@@ -280,9 +280,9 @@ 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 doen't work.
+ # mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -323,7 +323,7 @@ def build_simple_file_move_tests(sbox, s
test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -362,7 +362,7 @@ def build_simple_file_move_tests(sbox, s
wc_rev='-', moved_from=source)})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -403,7 +403,7 @@ def build_simple_file_move_tests(sbox, s
wc_rev='-', moved_from=source)})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -468,7 +468,7 @@ def build_simple_file_move_tests(sbox, s
wc_rev='-', moved_from=source)})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -508,7 +508,7 @@ def build_simple_file_move_tests(sbox, s
wc_rev='-', moved_from=source)})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -548,7 +548,7 @@ def build_simple_file_move_tests(sbox, s
wc_rev='-', moved_from=source)})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -588,7 +588,7 @@ def build_simple_file_move_tests(sbox, s
wc_rev='-', moved_from=source)})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -628,7 +628,7 @@ def build_simple_file_move_tests(sbox, s
wc_rev='-', moved_from=source)})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}
@@ -815,7 +815,7 @@ def build_simple_file_move_tests(sbox, s
treeconflict='C')})
# mine-conflict doesn't work.
mc = {}
- mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+ mc['error'] = svntest.verify.RegexOutput(".*: .*: W195024:.*", match_all=False)
mc['status'] = test['up_status']
mc['disk'] = test['up_disk']
working = {}