You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2015/06/10 19:03:03 UTC

svn commit: r1684714 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java

Author: hossman
Date: Wed Jun 10 17:03:03 2015
New Revision: 1684714

URL: http://svn.apache.org/r1684714
Log:
SOLR-7603: remove extra logging added to diagnose problem - failure hasn't reappeared since fix applied in r1682570

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1684714&r1=1684713&r2=1684714&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jun 10 17:03:03 2015
@@ -141,6 +141,8 @@ Other Changes
 * SOLR-7645: Remove explicitly defined request handlers from example and test solrconfig's that are
   already defined implicitly, such as /admin/ping, /admin/system, and several others.  (ehatcher)
 
+* SOLR-7603: Fix test only bug in UpdateRequestProcessorFactoryTest (hossman)
+
 ==================  5.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java?rev=1684714&r1=1684713&r2=1684714&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java Wed Jun 10 17:03:03 2015
@@ -26,7 +26,6 @@ import java.util.List;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.response.SolrQueryResponse;
 import org.apache.solr.util.AbstractSolrTestCase;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 /**
@@ -34,23 +33,11 @@ import org.junit.BeforeClass;
  */
 public class UpdateRequestProcessorFactoryTest extends AbstractSolrTestCase {
 
-  private static org.apache.log4j.Level SAVED_LEVEL = null; // SOLR-7603 - remove
-  
   @BeforeClass
   public static void beforeClass() throws Exception {
-
-    // SOLR-7603 - remove
-    SAVED_LEVEL = org.apache.log4j.LogManager.getRootLogger().getLevel();
-    org.apache.log4j.LogManager.getRootLogger().setLevel(org.apache.log4j.Level.DEBUG);
-    
     initCore("solrconfig-transformers.xml", "schema.xml");
   }
   
-  @AfterClass
-  public static void fixLogLevelAfterClass() throws Exception { // SOLR-7603 - remove
-    org.apache.log4j.LogManager.getRootLogger().setLevel(SAVED_LEVEL);
-  }
-
   public void testConfiguration() throws Exception 
   {
     SolrCore core = h.getCore();