I just mentioned to Johann that this is a duplicate of update_locked_deleted() in update_tests.py.
Thanks to the test decorators, rgrep is useful for checking if an issue already has a test: ./lock_tests.py:1654:@Issue(3525) ./update_tests.py:5116:@Issue(3525) Steve On May 17, 2011, at 14:54 , [email protected] wrote: > Author: jcorvel > Date: Tue May 17 12:54:31 2011 > New Revision: 1104208 > > URL: http://svn.apache.org/viewvc?rev=1104208&view=rev > Log: > Add XFail test for issue #3525 (Locked file which is scheduled for delete > causes tree conflict) > > * subversion/tests/cmdline/lock_tests.py > (update_locked_deleted): New test. > (test_list): Add update_locked_deleted to the list. > > Review by: rhuijben > > Modified: > subversion/trunk/subversion/tests/cmdline/lock_tests.py > > Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1104208&r1=1104207&r2=1104208&view=diff > ============================================================================== > --- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original) > +++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Tue May 17 > 12:54:31 2011 > @@ -1647,6 +1647,41 @@ def cp_isnt_ro(sbox): > is_readonly(mu3_path) > > > +#---------------------------------------------------------------------- > +# Issue #3525: Locked file which is scheduled for delete causes tree > +# conflict > +@XFail() > +@Issue(3525) > +def update_locked_deleted(sbox): > + "updating locked scheduled-for-delete file" > + > + sbox.build() > + wc_dir = sbox.wc_dir > + > + iota_path = os.path.join(wc_dir, 'iota') > + mu_path = os.path.join(wc_dir, 'A', 'mu') > + > + svntest.main.run_svn(None, 'lock', '-m', 'locked', mu_path, iota_path) > + sbox.simple_rm('iota') > + sbox.simple_rm('A/mu') > + > + # Create expected output tree for an update to rev 2. > + expected_output = svntest.wc.State(wc_dir, { > + }) > + > + # Create expected status tree for the update. > + expected_status = svntest.actions.get_virginal_state(wc_dir, 1) > + expected_status.tweak('iota', 'A/mu', status='D ', writelocked='K') > + > + svntest.actions.run_and_verify_update(wc_dir, > + expected_output, > + None, > + expected_status, > + None, None, None, > + None, None) > + > + > + > ######################################################################## > # Run the tests > > @@ -1692,6 +1727,7 @@ test_list = [ None, > verify_path_escaping, > replace_and_propset_locked_path, > cp_isnt_ro, > + update_locked_deleted, > ] > > if __name__ == '__main__': > > -- Stephen Butler | Senior Consultant elego Software Solutions GmbH Gustav-Meyer-Allee 25 | 13355 Berlin | Germany tel: +49 30 2345 8696 | mobile: +49 163 25 45 015 fax: +49 30 2345 8695 | http://www.elegosoft.com Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
