Author: stsp Date: Sun Oct 16 14:57:24 2016 New Revision: 1765163 URL: http://svn.apache.org/viewvc?rev=1765163&view=rev Log: * subversion/tests/cmdline/move_tests.py (move_many_update_add): Fix test expecations. For some reason --accept=mc for tree conflicts has changed behaviour and this test started to fail. Make the test accept the current behaviour.
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=1765163&r1=1765162&r2=1765163&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/move_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/move_tests.py Sun Oct 16 14:57:24 2016 @@ -1387,7 +1387,9 @@ def move_many_update_add(sbox): 'B/A/A' : Item(status=' ', treeconflict='U'), 'B/A/A/BB' : Item(status=' ', treeconflict='A'), # And while resolving - 'A/A' : Item(status=' ', treeconflict='C') + 'A/A' : Item(status=' ', treeconflict='C'), + 'A/A/A' : Item(status=' ', treeconflict='C'), + 'AAA_2/BB' : Item(status='A '), }) expected_status.tweak('', @@ -1395,10 +1397,10 @@ def move_many_update_add(sbox): 'C', 'C/A', 'C/A/A', 'C/A/A/A', wc_rev='3') - expected_status.tweak('A/A', treeconflict='C') expected_status.add({ 'A/A/A/BB' : Item(status='D ', copied='+', wc_rev='-'), 'B/A/A/BB' : Item(status='D ', wc_rev='3'), + 'AAA_2/BB' : Item(status=' ', copied='+', wc_rev='-'), }) svntest.actions.run_and_verify_update(wc_dir, expected_output, None, @@ -1414,20 +1416,21 @@ def move_many_update_add(sbox): expected_status.tweak('', 'B', 'B/A', 'B/A/A', 'B/A/A/A', 'C', 'C/A', 'C/A/A', 'C/A/A/A', - 'B/A/A/BB', wc_rev='4') expected_status.add({ + 'B/A/A/BB' : Item(status='D ', wc_rev='4'), 'C/A/A/BB' : Item(status='D ', wc_rev='4'), + 'AAA_3/BB' : Item(status=' ', copied='+', wc_rev='-'), }) - expected_status.tweak('A/A/A', treeconflict='C') expected_output = svntest.wc.State(wc_dir, { 'A/A/A' : Item(status=' ', treeconflict='C'), 'C/A' : Item(status=' ', treeconflict='C'), 'C/A/A' : Item(status=' ', treeconflict='U'), 'C/A/A/BB' : Item(status=' ', treeconflict='A'), + 'AAA_3/BB' : Item(status='A '), }) # This currently triggers an assertion failure