lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1573003 [3/3] - in /lucene/dev/branches/lucene5376: ./ dev-tools/ dev-tools/scripts/ lucene/ lucene/analysis/ lucene/analysis/common/ lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ lucene/analysis/common/src/test/org/...
Date Fri, 28 Feb 2014 17:12:09 GMT
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
(original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
Fri Feb 28 17:12:07 2014
@@ -84,7 +84,7 @@ import org.junit.Test;
  * @since 1.4
  */
 @Slow
-@SuppressSSL     // does not work yet with SSL
+@SuppressSSL     // Currently unknown why SSL does not work with this test
 public class TestReplicationHandler extends SolrTestCaseJ4 {
 
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
Fri Feb 28 17:12:07 2014
@@ -30,6 +30,12 @@ import org.junit.BeforeClass;
  */
 public class DistributedQueryElevationComponentTest extends BaseDistributedSearchTestCase
{
 
+  @BeforeClass
+  public static void betterNotBeJ9() {
+    assumeFalse("FIXME: SOLR-5791: This test fails under J9", 
+                System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+  }
+
   public DistributedQueryElevationComponentTest() {
     fixShardCount = true;
     shardCount = 3;

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
Fri Feb 28 17:12:07 2014
@@ -19,8 +19,14 @@ package org.apache.solr.handler.componen
 
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.common.params.TermVectorParams;
+import org.junit.BeforeClass;
 
 public class TermVectorComponentDistributedTest extends BaseDistributedSearchTestCase {
+  @BeforeClass
+  public static void betterNotBeJ9() {
+    assumeFalse("FIXME: SOLR-5792: This test fails under J9", 
+                System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+  }
 
   @Override
   public void doTest() throws Exception {

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
(original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
Fri Feb 28 17:12:07 2014
@@ -46,7 +46,7 @@ import java.net.URLEncoder;
 /**
  * See SOLR-2854.
  */
-@SuppressSSL     // does not yet work with ssl - uses raw URL
+@SuppressSSL     // does not yet work with ssl yet - uses raw java.net.URL API rather than
HttpClient
 public class TestRemoteStreaming extends SolrJettyTestBase {
 
   private static final File solrHomeDirectory = new File(TEMP_DIR, "TestRemoteStreaming");

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
Fri Feb 28 17:12:07 2014
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import org.apache.solr.BaseDistributedSearchTestCase;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -31,6 +32,7 @@ import org.apache.solr.common.util.StrUt
 import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
 import static org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase;
 
+@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
 public class PeerSyncTest extends BaseDistributedSearchTestCase {
   private static int numVersions = 100;  // number of versions to use when syncing
   private final String FROM_LEADER = DistribPhase.FROMLEADER.toString();

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
Fri Feb 28 17:12:07 2014
@@ -47,6 +47,13 @@ import org.junit.Test;
  */
 public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
 
+  @BeforeClass
+  public static void betterNotBeJ9() {
+    assumeFalse("FIXME: SOLR-5793: This test fails under J9", 
+                System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+  }
+
+
   /** modified by tests as needed */
   private String chain = "dedupe";
 

Modified: lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
Fri Feb 28 17:12:07 2014
@@ -17,6 +17,7 @@
 
 package org.apache.solr.client.solrj;
 
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrExampleTests;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
@@ -30,6 +31,7 @@ import org.junit.BeforeClass;
  * A subclass of SolrExampleTests that explicitly uses the binary 
  * codec for communication. 
  */
+@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
 public class SolrExampleBinaryTest extends SolrExampleTests {
   @BeforeClass
   public static void beforeTest() throws Exception {

Modified: lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
Fri Feb 28 17:12:07 2014
@@ -17,6 +17,7 @@
 
 package org.apache.solr.client.solrj;
 
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
 import org.apache.solr.client.solrj.request.RequestWriter;
@@ -27,6 +28,7 @@ import org.junit.BeforeClass;
  * A subclass of SolrExampleTests that explicitly uses the xml codec for
  * communication.
  */
+@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
 public class SolrExampleXMLTest extends SolrExampleTests {
   @BeforeClass
   public static void beforeTest() throws Exception {

Modified: lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
(original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
Fri Feb 28 17:12:07 2014
@@ -17,6 +17,7 @@
 package org.apache.solr.client.solrj;
 
 import org.apache.solr.SolrJettyTestBase;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.beans.Field;
 import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -36,6 +37,7 @@ import java.util.Iterator;
  * @since solr 1.4
  *
  */
+@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
 public class TestBatchUpdate extends SolrJettyTestBase {
 
   @BeforeClass

Modified: lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
Fri Feb 28 17:12:07 2014
@@ -17,10 +17,10 @@
 
 package org.apache.solr.client.solrj.embedded;
 
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrExampleTests;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.apache.solr.util.ExternalPaths;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -31,6 +31,7 @@ import org.junit.Test;
  * rather then open a real connection?
  * 
  */
+@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
 public class SolrExampleJettyTest extends SolrExampleTests {
 
   @BeforeClass

Modified: lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
Fri Feb 28 17:12:07 2014
@@ -17,14 +17,15 @@ package org.apache.solr.client.solrj.emb
  * limitations under the License.
  */
 
-import org.apache.lucene.util.LuceneTestCase.BadApple;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
 import org.apache.solr.client.solrj.impl.BinaryResponseParser;
 import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer;
 
-@Slow @BadApple
+@Slow
+@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
 public class SolrExampleStreamingBinaryTest extends SolrExampleStreamingTest {
 
   @Override

Modified: lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
(original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
Fri Feb 28 17:12:07 2014
@@ -44,7 +44,7 @@ import org.junit.BeforeClass;
 /**
  * This test would be faster if we simulated the zk state instead.
  */
-@Slow @BadApple
+@Slow
 public class CloudSolrServerTest extends AbstractFullDistribZkTestBase {
   
   private static final String SOLR_HOME = getFile("solrj" + File.separator + "solr").getAbsolutePath();

Modified: lucene/dev/branches/lucene5376/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1573003&r1=1573002&r2=1573003&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
(original)
+++ lucene/dev/branches/lucene5376/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Fri Feb 28 17:12:07 2014
@@ -129,7 +129,10 @@ public abstract class SolrTestCaseJ4 ext
   @Inherited
   @Retention(RetentionPolicy.RUNTIME)
   @Target(ElementType.TYPE)
-  public @interface SuppressSSL {}
+  public @interface SuppressSSL {
+    /** Point to JIRA entry. */
+    public String bugUrl() default "None";
+  }
   
   // these are meant to be accessed sequentially, but are volatile just to ensure any test
   // thread will read the latest value



Mime
View raw message