Author: rhuijben
Date: Thu May 19 21:30:26 2011
New Revision: 1125126
URL: http://svn.apache.org/viewvc?rev=1125126&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
(lock_update_only): Remove XFail marker of yet another test for
issue #3525 and #3533, after fixing the expectation that we locked
this node in this working copy instead of in another working copy.
(We just locked it a few lines above, but a bug in the status code
made us check the invalid repos_relpath until I fixed that yesterday)
Modified:
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1125126&r1=1125125&r2=1125126&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Thu May 19
21:30:26 2011
@@ -1040,7 +1040,6 @@ def up_add_onto_add_revert(sbox):
#----------------------------------------------------------------------
# Regression test for issue #3525 and #3533
#
-@XFail()
@Issues(3525,3533)
def lock_update_only(sbox):
"lock status update shouldn't flag tree conflict"
@@ -1069,7 +1068,7 @@ def lock_update_only(sbox):
expected_disk = main.greek_state.copy()
expected_disk.remove('iota')
expected_status = get_virginal_state(wc_dir, 1)
- expected_status.tweak('iota', status='D ', writelocked='O')
+ expected_status.tweak('iota', status='D ', writelocked='K')
run_and_verify_update(wc_dir,
None, expected_disk, expected_status,
None, None, None, None, None, 1,
