You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/01/24 18:01:42 UTC

svn commit: r1438073 - /subversion/trunk/subversion/tests/cmdline/lock_tests.py

Author: philip
Date: Thu Jan 24 17:01:42 2013
New Revision: 1438073

URL: http://svn.apache.org/viewvc?rev=1438073&view=rev
Log:
Add an XFAIL test for issue 4304.

* subversion/tests/cmdline/lock_tests.py
  (lock_unlock_deleted): New test.
  (test_list): Add new test.

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=1438073&r1=1438072&r2=1438073&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Thu Jan 24 17:01:42 2013
@@ -1788,6 +1788,31 @@ def locks_stick_over_switch(sbox):
                                         expected_output, None, expected_status)
 
 
+@XFail()
+@Issue(4304)
+def lock_unlock_deleted(sbox):
+  "lock/unlock a deleted file"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'rm', sbox.ospath('A/mu'))
+
+  expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+  expected_status.tweak('A/mu', status='D ')
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+  expected_output = '\'mu\' locked by user \'jrandom\'.'
+  svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                     'lock', sbox.ospath('A/mu'))
+  expected_status.tweak('A/mu', writelocked='K')
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+  expected_output = '\'mu\' unlocked.'
+  svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                     'unlock', sbox.ospath('A/mu'))
+  expected_status.tweak('A/mu', writelocked=None)
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
 ########################################################################
 # Run the tests
@@ -1839,6 +1864,7 @@ test_list = [ None,
               lock_invalid_token,
               lock_multi_wc,
               locks_stick_over_switch,
+              lock_unlock_deleted,
             ]
 
 if __name__ == '__main__':