lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r1306702 - in /lucene/dev/trunk/solr: core/src/test/org/apache/solr/TestDistributedSearch.java test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java testlogging.properties
Date Thu, 29 Mar 2012 03:27:02 GMT
Author: yonik
Date: Thu Mar 29 03:27:02 2012
New Revision: 1306702

URL: http://svn.apache.org/viewvc?rev=1306702&view=rev
Log:
SOLR-3161: ignore expected exceptions

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
    lucene/dev/trunk/solr/testlogging.properties

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1306702&r1=1306701&r2=1306702&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Thu Mar
29 03:27:02 2012
@@ -292,11 +292,13 @@ public class TestDistributedSearch exten
     //SOLR 3161 ensure shards.qt=/update fails (anything but search handler really)
     // Also see TestRemoteStreaming#testQtUpdateFails()
     try {
+      ignoreException("isShard is only acceptable");
       query("q","*:*","shards.qt","/update","stream.body","<delete><query>*:*</query></delete>");
       fail();
     } catch (SolrException e) {
       //expected
     }
+    unIgnoreException("isShard is only acceptable");
 
     // test debugging
     handle.put("explain", UNORDERED);

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1306702&r1=1306701&r2=1306702&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Thu
Mar 29 03:27:02 2012
@@ -235,6 +235,12 @@ public abstract class SolrTestCaseJ4 ext
     SolrException.ignorePatterns.add(pattern);
   }
 
+  public static void unIgnoreException(String pattern) {
+    if (SolrException.ignorePatterns != null)
+      SolrException.ignorePatterns.remove(pattern);
+  }
+
+
   public static void resetExceptionIgnores() {
     SolrException.ignorePatterns = null;
     ignoreException("ignore_exception");  // always ignore "ignore_exception"    

Modified: lucene/dev/trunk/solr/testlogging.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/testlogging.properties?rev=1306702&r1=1306701&r2=1306702&view=diff
==============================================================================
--- lucene/dev/trunk/solr/testlogging.properties (original)
+++ lucene/dev/trunk/solr/testlogging.properties Thu Mar 29 03:27:02 2012
@@ -1,7 +1,14 @@
 handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.level=FINEST
-java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+#java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.formatter=org.apache.solr.SolrLogFormatter
+
 
 .level=SEVERE
-#org.apache.solr.update.UpdateLog.level=FINEST
+#.level=INFO
+
+#org.apache.solr.update.processor.LogUpdateProcessor=FINEST
+#org.apache.solr.update.processor.DistributedUpdateProcessor=FINEST
+#org.apache.solr.update.PeerSync.level=FINEST
+#org.apache.solr.update.UpdateLog.level=FINE
 #org.apache.solr.update.TransactionLog.level=FINEST



Mime
View raw message