lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwe...@apache.org
Subject svn commit: r1591218 - in /lucene/dev/branches/LUCENE-5622: lucene/replicator/src/test/org/apache/lucene/replicator/http/ lucene/spatial/src/test/org/apache/lucene/spatial/ solr/core/src/test/org/apache/solr/cloud/ solr/core/src/test/org/apache/solr/util/
Date Wed, 30 Apr 2014 09:24:13 GMT
Author: dweiss
Date: Wed Apr 30 09:24:13 2014
New Revision: 1591218

URL: http://svn.apache.org/r1591218
Log:
Marking known offenders.

Modified:
    lucene/dev/branches/LUCENE-5622/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
    lucene/dev/branches/LUCENE-5622/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
    lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
    lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java

Modified: lucene/dev/branches/LUCENE-5622/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-5622/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java?rev=1591218&r1=1591217&r2=1591218&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-5622/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
(original)
+++ lucene/dev/branches/LUCENE-5622/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
Wed Apr 30 09:24:13 2014
@@ -40,10 +40,18 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
 
 public class HttpReplicatorTest extends ReplicatorTestCase {
-  
+  @Rule
+  public TestRule testRules = 
+    RuleChain.outerRule(new SystemPropertiesRestoreRule());
+
   private File clientWorkDir;
   private Replicator serverReplicator;
   private IndexWriter writer;
@@ -69,7 +77,9 @@ public class HttpReplicatorTest extends 
   @Override
   public void setUp() throws Exception {
     super.setUp();
-    System.setProperty("org.eclipse.jetty.LEVEL", "DEBUG"); // sets stderr logging to DEBUG
level
+    if (VERBOSE) {
+      System.setProperty("org.eclipse.jetty.LEVEL", "DEBUG"); // sets stderr logging to DEBUG
level
+    }
     clientWorkDir = createTempDir("httpReplicatorTest");
     handlerIndexDir = newDirectory();
     serverIndexDir = newDirectory();
@@ -87,7 +97,6 @@ public class HttpReplicatorTest extends 
     stopHttpServer(server);
     writer.rollback();
     IOUtils.close(reader, handlerIndexDir, serverIndexDir);
-    System.clearProperty("org.eclipse.jetty.LEVEL");
     super.tearDown();
   }
   

Modified: lucene/dev/branches/LUCENE-5622/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-5622/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java?rev=1591218&r1=1591217&r2=1591218&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-5622/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
(original)
+++ lucene/dev/branches/LUCENE-5622/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
Wed Apr 30 09:24:13 2014
@@ -35,6 +35,8 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
+import org.apache.lucene.util.TestRuleLimitSysouts.Limit;
 import org.junit.After;
 import org.junit.Before;
 
@@ -47,6 +49,7 @@ import static com.carrotsearch.randomize
 import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;
 
 /** A base test class for spatial lucene. It's mostly Lucene generic. */
+@SuppressSysoutChecks(bugUrl = "These tests use JUL extensively.")
 public abstract class SpatialTestCase extends LuceneTestCase {
 
   private DirectoryReader indexReader;

Modified: lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java?rev=1591218&r1=1591217&r2=1591218&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
(original)
+++ lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
Wed Apr 30 09:24:13 2014
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -58,6 +59,7 @@ import com.carrotsearch.randomizedtestin
  * MiniSolrCloudCluster is designed to be used outside of the Lucene test
  * hierarchy.
  */
+@SuppressSysoutChecks(bugUrl = "Solr logs to JUL")
 public class TestMiniSolrCloudCluster extends LuceneTestCase {
 
   private static Logger log = LoggerFactory.getLogger(MiniSolrCloudCluster.class);

Modified: lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java?rev=1591218&r1=1591217&r2=1591218&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java
(original)
+++ lucene/dev/branches/LUCENE-5622/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java
Wed Apr 30 09:24:13 2014
@@ -19,6 +19,7 @@ package org.apache.solr.util;
 
 import org.apache.lucene.index.MergePolicy;
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -28,8 +29,8 @@ import java.lang.reflect.InvocationTarge
  * A "test the test" sanity check using reflection to ensure that 
  * {@linke RandomMergePolicy} is working as expected
  */
+@SuppressSysoutChecks(bugUrl = "Logs to JUL")
 public class TestRandomMergePolicy extends LuceneTestCase {  
-
   /**
    * Ensure every MP method is overridden by RMP 
    * (future proof ourselves against new methods being added to MP)



Mime
View raw message