You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/24 01:09:11 UTC
svn commit: r1580669 -
/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
Author: markrmiller
Date: Mon Mar 24 00:09:11 2014
New Revision: 1580669
URL: http://svn.apache.org/r1580669
Log:
tests: fix test
Modified:
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java?rev=1580669&r1=1580668&r2=1580669&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java Mon Mar 24 00:09:11 2014
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeoutExcep
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
@@ -39,6 +40,7 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
import org.apache.solr.cloud.AbstractZkTestCase;
import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection;
@@ -316,6 +318,8 @@ public class CloudSolrServerTest extends
server.setZkConnectTimeout(100);
server.connect();
fail("Expected exception");
+ } catch (SolrException e) {
+ assertTrue(e.getCause() instanceof TimeoutException);
} catch (RuntimeException e) {
assertTrue(e.getCause() instanceof TimeoutException);
} finally {