You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2014/06/11 11:56:00 UTC
svn commit: r1601844 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
Author: mreutegg
Date: Wed Jun 11 09:55:59 2014
New Revision: 1601844
URL: http://svn.apache.org/r1601844
Log:
OAK-1788: ConcurrentConflictTest fails occasionally
Disable test for now.
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1591552
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java?rev=1601844&r1=1601843&r2=1601844&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java Wed Jun 11 09:55:59 2014
@@ -78,6 +78,7 @@ public class ConcurrentConflictTest exte
concurrentUpdates(true);
}
+ @Ignore("OAK-1788")
@Test
public void concurrentUpdates() throws Exception {
concurrentUpdates(false);