svn commit: r1825961 - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java

[mreutegg]

Author: mreutegg
Date: Tue Mar  6 08:47:10 2018
New Revision: 1825961

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

Merge revision 1825470 from trunk

Modified:
    jackrabbit/oak/branches/1.8/   (props changed)
    
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java

Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 08:47:10 2018
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824962,1825362,1825381,1825442,1825448,1825466,1825475,1825523,1825525,1825619-1825621,1825651
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java?rev=1825961&r1=1825960&r2=1825961&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatusTest.java
 Tue Mar  6 08:47:10 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);