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:25:02 UTC
svn commit: r1383376 - in
/subversion/branches/1.6.x-testsuite-apr-hash-order: ./
subversion/tests/cmdline/lock_tests.py
subversion/tests/cmdline/svntest/verify.py
subversion/tests/cmdline/update_tests.py
Author: stsp
Date: Tue Sep 11 12:25:02 2012
New Revision: 1383376
URL: http://svn.apache.org/viewvc?rev=1383376&view=rev
Log:
On the 1.6.x-testsuite-apr-hash-order branch, merge r1292516,
r1292768, and r1292926 from trunk (clean merge).
Modified:
subversion/branches/1.6.x-testsuite-apr-hash-order/ (props changed)
subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/lock_tests.py
subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/svntest/verify.py
subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/update_tests.py
Propchange: subversion/branches/1.6.x-testsuite-apr-hash-order/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1292516,1292768,1292926
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=1383376&r1=1383375&r2=1383376&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:25:02 2012
@@ -1164,6 +1164,8 @@ 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"
Modified: subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/svntest/verify.py?rev=1383376&r1=1383375&r2=1383376&view=diff
==============================================================================
--- subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/svntest/verify.py Tue Sep 11 12:25:02 2012
@@ -387,7 +387,7 @@ class DumpParser:
return m.group(1)
def parse_blank(self, required=True):
- if self.lines[self.current] != '\n': # Windows?
+ if self.lines[self.current] != '\n': # Works on Windows
if required:
raise SVNDumpParseError("expected blank at line %d\n%s"
% (self.current, self.lines[self.current]))
Modified: subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/update_tests.py?rev=1383376&r1=1383375&r2=1383376&view=diff
==============================================================================
--- subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/branches/1.6.x-testsuite-apr-hash-order/subversion/tests/cmdline/update_tests.py Tue Sep 11 12:25:02 2012
@@ -1101,6 +1101,7 @@ def another_hudson_problem(sbox):
# Sigh, I can't get run_and_verify_update to work (but not because
# of issue 919 as far as I can tell)
+ expected_output = svntest.verify.UnorderedOutput(expected_output)
svntest.actions.run_and_verify_svn(None,
['D '+G_path+'\n',
'Updated to revision 3.\n',