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 2015/09/07 09:22:10 UTC

svn commit: r1701567 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CollisionMarkerTest.java

Author: mreutegg
Date: Mon Sep  7 07:22:10 2015
New Revision: 1701567

URL: http://svn.apache.org/r1701567
Log:
OAK-3344: Commit may add collision marker for committed revision

Simplify test

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CollisionMarkerTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CollisionMarkerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CollisionMarkerTest.java?rev=1701567&r1=1701566&r2=1701567&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CollisionMarkerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CollisionMarkerTest.java Mon Sep  7 07:22:10 2015
@@ -93,9 +93,7 @@ public class CollisionMarkerTest extends
     }
 
     private static DocumentMK newDocumentMK(MongoConnection c) {
-        // set async delay to a high value to make sure
-        // the commit root is outdated when ns2 commits
-        DocumentMK mk = new DocumentMK.Builder().setAsyncDelay(60000)
+        DocumentMK mk = new DocumentMK.Builder().setAsyncDelay(0)
                 .setLeaseCheck(false)
                 .setMongoDB(c.getDB()).open();
         // do not retry on conflicts