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 ch...@apache.org on 2016/09/15 06:28:42 UTC

svn commit: r1760829 - in /jackrabbit/oak/trunk: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy

Author: chetanm
Date: Thu Sep 15 06:28:42 2016
New Revision: 1760829

URL: http://svn.apache.org/viewvc?rev=1760829&view=rev
Log:
OAK-4807 - SecondaryStoreConfigIT intermittently failing due to incorrect MongoURL

Specify db name explicitly

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
    jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java?rev=1760829&r1=1760828&r2=1760829&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java Thu Sep 15 06:28:42 2016
@@ -33,7 +33,7 @@ public class MongoUtils {
     protected static final int PORT =
             Integer.getInteger("mongo.port", 27017);
 
-    protected static final String DB =
+    public static final String DB =
             System.getProperty("mongo.db", "MongoMKDB");
 
     public static final String URL =

Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy?rev=1760829&r1=1760828&r2=1760829&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/SecondaryStoreConfigIT.groovy Thu Sep 15 06:28:42 2016
@@ -39,11 +39,12 @@ class SecondaryStoreConfigIT extends Abs
     @Test
     public void secondaryNodeStoreCache() throws Exception{
         mongoCheck()
-
+        MongoUtils.dropDatabase(MongoUtils.DB)
         config[REPOSITORY_CONFIG_FILE] = createConfigValue("oak-base-config.json")
         config[REPOSITORY_CONFIG] = [
                 'org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService': [
-                        mongouri       : MongoUtils.URL
+                        mongouri       : MongoUtils.URL,
+                        db             : MongoUtils.DB
                 ],
                 'org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService' : [
                         secondary       : true