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 2018/02/27 16:04:26 UTC

svn commit: r1825470 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java

Author: mreutegg
Date: Tue Feb 27 16:04:25 2018
New Revision: 1825470

URL: http://svn.apache.org/viewvc?rev=1825470&view=rev
Log:
OAK-7291: MongoStatusTest.testReadConcern fails on MongoDB 3.6

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

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java?rev=1825470&r1=1825469&r2=1825470&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java Tue Feb 27 16:04:25 2018
@@ -65,7 +65,12 @@ public class MongoStatusTest {
         BasicDBObject storageEngine = new BasicDBObject();
         status.setServerStatus(mockServerStatus);
 
-        assertFalse(status.isMajorityReadConcernSupported());
+        if (status.isVersion(3, 6)) {
+            // OAK-7291: majority read concern is enabled by default
+            assertTrue(status.isMajorityReadConcernSupported());
+        } else {
+            assertFalse(status.isMajorityReadConcernSupported());
+        }
 
         mockServerStatus.put("storageEngine", storageEngine);
         status.setServerStatus(mockServerStatus);