You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/11 14:43:33 UTC
svn commit: r1383382 -
/subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py
Author: stsp
Date: Tue Sep 11 12:43:33 2012
New Revision: 1383382
URL: http://svn.apache.org/viewvc?rev=1383382&view=rev
Log:
On the 1.6.x-testsuite-apr-hash-order branch, allow lock_tests.py to run.
Follow-up to r1383376.
* subversion/tests/cmdline/lock_tests.py
(unlock_already_unlocked_files): Move Skip marker into the test list.
Remove @Issue annotation -- not supported in 1.6.x.
Modified:
subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py
Modified: subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py?rev=1383382&r1=1383381&r2=1383382&view=diff
==============================================================================
--- subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py Tue Sep 11 12:43:33 2012
@@ -1164,8 +1164,6 @@ def repos_lock_with_info(sbox):
raise svntest.Failure
#----------------------------------------------------------------------
-@Issue(4126)
-@Skip(svntest.main.is_ra_type_dav_serf) # Issue 4126 unpredictable result
def unlock_already_unlocked_files(sbox):
"(un)lock set of files, one already (un)locked"
@@ -1464,7 +1462,9 @@ test_list = [ None,
SkipUnless(lock_and_exebit2, svntest.main.is_posix_os),
commit_xml_unsafe_file_unlock,
repos_lock_with_info,
- unlock_already_unlocked_files,
+ # Issue 4126 unpredictable result
+ Skip(unlock_already_unlocked_files,
+ svntest.main.is_ra_type_dav_serf),
info_moved_path,
ls_url_encoded,
XFail(unlock_wrong_token, svntest.main.is_ra_type_dav),