Author: philip
Date: Wed Oct 19 11:19:14 2011
New Revision: 1186101
URL: http://svn.apache.org/viewvc?rev=1186101&view=rev
Log:
Extend a failing test.
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_missing_replaced): Adjust expectations, add status call.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186101&r1=1186100&r2=1186101&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19
11:19:14 2011
@@ -1249,10 +1249,15 @@ def upgrade_missing_replaced(sbox):
sbox.wc_dir)
expected_output = svntest.wc.State(sbox.wc_dir, {
- 'A/B/E/alpha' : Item(status='A '),
+ 'A/B/E' : Item(status=' ', treeconflict='C'),
+ 'A/B/E/alpha' : Item(status=' ', treeconflict='A'),
+ 'A/B/E/beta' : Item(status=' ', treeconflict='A'),
})
+ expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+ expected_status.tweak('A/B/E', status='! ', treeconflict='C', wc_rev='-')
+ expected_status.tweak('A/B/E/alpha', 'A/B/E/beta', status='D ')
svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
- None, None)
+ None, expected_status)
########################################################################
# Run the tests
