You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/06/18 17:47:17 UTC
svn commit: r1603494 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/test/org/apache/solr/TestDistributedSearch.java
Author: shalin
Date: Wed Jun 18 15:47:16 2014
New Revision: 1603494
URL: http://svn.apache.org/r1603494
Log:
SOLR-6173: Fixed wrong failure message in TestDistributedSearch
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1603494&r1=1603493&r2=1603494&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jun 18 15:47:16 2014
@@ -88,10 +88,16 @@ Other Changes
================== 4.10.0 =================
-Bug fixes
+Bug Fixes
+----------------------
* SOLR-6095 : SolrCloud cluster can end up without an overseer with overseer roles (Noble Paul, Shalin Mangar)
+Other Changes
+---------------------
+
+* SOLR-6173: Fixed wrong failure message in TestDistributedSearch. (shalin)
+
================== 4.9.0 ==================
Versions of Major Components
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=1603494&r1=1603493&r2=1603494&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 Wed Jun 18 15:47:16 2014
@@ -27,6 +27,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.ChaosMonkey;
import org.apache.solr.common.SolrException;
@@ -269,10 +270,10 @@ public class TestDistributedSearch exten
query("q","*:*", "sort",i1+" desc", "stats", "true", "stats.field", tdate_b);
handle.put("stats_fields", UNORDERED);
- query("q","*:*", "sort",i1+" desc", "stats", "true",
- "stats.field", "stats_dt",
- "stats.field", i1,
- "stats.field", tdate_a,
+ query("q","*:*", "sort",i1+" desc", "stats", "true",
+ "stats.field", "stats_dt",
+ "stats.field", i1,
+ "stats.field", tdate_a,
"stats.field", tdate_b);
/*** TODO: the failure may come back in "exception"
@@ -430,9 +431,12 @@ public class TestDistributedSearch exten
"stats.field", tdate_a,
"stats.field", tdate_b,
"stats.calcdistinct", "true");
- } catch (Exception e) {
- log.error("Exception on distrib stats request on empty index", e);
- fail("NullPointerException with stats request on empty index");
+ } catch (HttpSolrServer.RemoteSolrException e) {
+ if (e.getMessage().startsWith("java.lang.NullPointerException")) {
+ fail("NullPointerException with stats request on empty index");
+ } else {
+ throw e;
+ }
}
}