Author: rhuijben
Date: Sat Jan 19 21:37:08 2013
New Revision: 1435714
URL: http://svn.apache.org/viewvc?rev=1435714&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
(update_removes_switched): Following up on r1435684, add missing item for
root of working copy.
Modified:
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1435714&r1=1435713&r2=1435714&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sat Jan 19
21:37:08 2013
@@ -6170,6 +6170,7 @@ def update_removes_switched(sbox):
'B' : Item(status='D '),
})
expected_status = svntest.wc.State(wc_dir, {
+ '' : Item(status=' ', wc_rev='3'),
'D' : Item(status=' ', wc_rev='3'),
'D/G' : Item(status=' ', wc_rev='3'),
'D/G/rho' : Item(status=' ', wc_rev='3'),
@@ -6184,8 +6185,8 @@ def update_removes_switched(sbox):
'mu' : Item(status=' ', wc_rev='3'),
})
- # Before r<to-be-filled-in> the inherited properties code would try to fetch
- # inherited properties for ^/AA/B and fail. (2013-01-19)
+ # Before r1435684 the inherited properties code would try to fetch
+ # inherited properties for ^/AA/B and fail.
#
# The inherited properties fetch code would then bail and forget to reset
# the ra-session URL back to its original value.
@@ -6201,15 +6202,40 @@ def update_removes_switched(sbox):
expected_status)
#expected_output = svntest.wc.State(wc_dir, {
+ # 'B' : Item(status='A '),
+ # 'B/lambda' : Item(status='A '),
+ # 'B/E' : Item(status='A '),
+ # 'B/E/alpha' : Item(status='A '),
+ # 'B/E/beta' : Item(status='A '),
+ # 'B/F' : Item(status='A '),
#})
#expected_status = svntest.wc.State(wc_dir, {
+ # '' : Item(status=' ', wc_rev='3'),
+ # 'D' : Item(status=' ', wc_rev='3'),
+ # 'D/G' : Item(status=' ', wc_rev='3'),
+ # 'D/G/rho' : Item(status=' ', wc_rev='3'),
+ # 'D/G/pi' : Item(status=' ', wc_rev='3'),
+ # 'D/G/tau' : Item(status=' ', wc_rev='3'),
+ # 'D/H' : Item(status=' ', wc_rev='3'),
+ # 'D/H/omega' : Item(status=' ', wc_rev='3'),
+ # 'D/H/chi' : Item(status=' ', wc_rev='3'),
+ # 'D/H/psi' : Item(status=' ', wc_rev='3'),
+ # 'D/gamma' : Item(status=' ', wc_rev='3'),
+ # 'B' : Item(status=' ', wc_rev='3'),
+ # 'B/E' : Item(status=' ', wc_rev='3'),
+ # 'B/E/alpha' : Item(status=' ', wc_rev='3'),
+ # 'B/E/beta' : Item(status=' ', wc_rev='3'),
+ # 'B/F' : Item(status=' ', wc_rev='3'),
+ # 'B/lambda' : Item(status=' ', wc_rev='3'),
+ # 'C' : Item(status=' ', wc_rev='3'),
+ # 'mu' : Item(status=' ', wc_rev='3'),
#})
#
- # But I call it XFail that the node is not brought back in by this update
+ ## But I call it XFail that the node is not brought back in by this update
#svntest.actions.run_and_verify_update(wc_dir,
# expected_output,
- # None,
- # expected_status)
+ # None,
+ # None)
#######################################################################
# Run the tests
