svn commit: r908211 - /lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java

[yo...@apache.org]

Author: yonik
Date: Tue Feb  9 20:47:41 2010
New Revision: 908211

URL: http://svn.apache.org/viewvc?rev=908211&view=rev
Log:
solrj distrib test code only fails if you have another server running at 8983

Modified:
    lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java

Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=908211&r1=908210&r2=908211&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Tue Feb  9 20:47:41 2010
@@ -80,6 +80,8 @@
     params.set("distrib","true");
   }
 
+  // TODO: there is an incorrect localhost:8983 shard registered
+
   protected void createServers(int numShards) throws Exception {
     controlJetty = createJetty(testDir, "control", "control_shardId");
     controlClient = createNewSolrServer(controlJetty.getLocalPort());
@@ -269,7 +271,7 @@
 
   @Override
   protected QueryResponse queryServer(ModifiableSolrParams params) throws SolrServerException {
-    if (true || r.nextBoolean())
+    if (r.nextBoolean())
       return super.queryServer(params);
 
     // use the distributed solrj client
@@ -285,6 +287,9 @@
       }
     }
 
+    if (r.nextBoolean())
+      params.set("collection","collection1");
+
     QueryResponse rsp = solrj.query(params);
     return rsp;
   }