You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by ma...@apache.org on 2014/02/12 18:43:10 UTC

svn commit: r1567700 - /lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java

Author: markrmiller
Date: Wed Feb 12 17:43:10 2014
New Revision: 1567700

URL: http://svn.apache.org/r1567700
Log:
SOLR-3854: Update MorphlineGoLiveMiniMRTest for SSL. Disable SSL for now .

Modified:
    lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java

Modified: lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1567700&r1=1567699&r2=1567700&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Wed Feb 12 17:43:10 2014
@@ -91,6 +91,10 @@ import com.carrotsearch.randomizedtestin
 @Slow
 public class MorphlineGoLiveMiniMRTest extends AbstractFullDistribZkTestBase {
   
+  static {
+    ALLOW_SSL = false;
+  }
+  
   private static final int RECORD_COUNT = 2104;
   private static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files";  
   private static final String DOCUMENTS_DIR = RESOURCES_DIR + "/test-documents";
@@ -690,7 +694,7 @@ public class MorphlineGoLiveMiniMRTest e
       throws Exception {
     
     JettySolrRunner jetty = new JettySolrRunner(solrHome.getAbsolutePath(),
-        context, 0, solrConfigOverride, schemaOverride);
+        context, 0, solrConfigOverride, schemaOverride, true, null, sslConfig);
 
     jetty.setShards(shardList);