From e618e831d3ac040081769ebd27324a1d190fbc5d Mon Sep 17 00:00:00 2001 From: Joel Bernstein Date: Mon, 29 Oct 2018 13:49:31 -0400 Subject: [PATCH] SOLR-12935: Suppress SSL for StreamExpressionTest and StreamDecoratorTest --- .../apache/solr/client/solrj/io/stream/StreamDecoratorTest.java | 2 ++ .../solr/client/solrj/io/stream/StreamExpressionTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java index 0a8030c5ac0..af79ea687d8 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java @@ -26,6 +26,7 @@ import java.util.Map; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Slow; +import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.io.SolrClientCache; import org.apache.solr.client.solrj.io.Tuple; @@ -65,6 +66,7 @@ import org.junit.BeforeClass; import org.junit.Test; @Slow +@SolrTestCaseJ4.SuppressSSL @LuceneTestCase.SuppressCodecs({"Lucene3x", "Lucene40","Lucene41","Lucene42","Lucene45"}) //commented 23-AUG-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Jul-2018 public class StreamDecoratorTest extends SolrCloudTestCase { diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java index add34cb076f..24264b6304f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java @@ -26,6 +26,7 @@ import java.util.Map; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Slow; +import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.io.ClassificationEvaluation; import org.apache.solr.client.solrj.io.SolrClientCache; @@ -52,6 +53,7 @@ import org.junit.BeforeClass; import org.junit.Test; @Slow +@SolrTestCaseJ4.SuppressSSL @LuceneTestCase.SuppressCodecs({"Lucene3x", "Lucene40","Lucene41","Lucene42","Lucene45"}) public class StreamExpressionTest extends SolrCloudTestCase {