lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r901776 - in /lucene/solr/branches/cloud/src/test/org/apache/solr/cloud: AbstractZkTestCase.java ZkControllerTest.java ZkTestServer.java
Date Thu, 21 Jan 2010 17:05:31 GMT
Author: markrmiller
Date: Thu Jan 21 17:05:30 2010
New Revision: 901776

URL: http://svn.apache.org/viewvc?rev=901776&view=rev
Log:
use different zk port for tests

Modified:
    lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
    lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
    lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java

Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java?rev=901776&r1=901775&r2=901776&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java Thu
Jan 21 17:05:30 2010
@@ -30,8 +30,8 @@
  */
 public abstract class AbstractZkTestCase extends AbstractSolrTestCase {
 
-  static final String ZOO_KEEPER_ADDRESS = "localhost:2181/solr";
-  static final String ZOO_KEEPER_SERVER = "localhost:2181";
+  static final String ZOO_KEEPER_ADDRESS = "localhost:2323/solr";
+  static final String ZOO_KEEPER_SERVER = "localhost:2323";
   static final int TIMEOUT = 10000;
 
   protected static Logger log = LoggerFactory

Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=901776&r1=901775&r2=901776&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java Thu Jan
21 17:05:30 2010
@@ -42,10 +42,6 @@
 
   private static final String COLLECTION_NAME = "collection1";
 
-  static final String ZOO_KEEPER_ADDRESS = "localhost:2181/solr";
-
-  static final String ZOO_KEEPER_HOST = "localhost:2181";
-
   static final int TIMEOUT = 10000;
 
   private static final String URL1 = "http://localhost:3133/solr/core0";
@@ -68,7 +64,7 @@
 
       AbstractZkTestCase.makeSolrZkNode();
 
-      zkClient = new SolrZkClient(ZOO_KEEPER_ADDRESS, TIMEOUT);
+      zkClient = new SolrZkClient(AbstractZkTestCase.ZOO_KEEPER_ADDRESS, TIMEOUT);
       String shardsPath = "/collections/collection1/shards/shardid1";
       zkClient.makePath(shardsPath);
 
@@ -82,7 +78,7 @@
         zkClient.printLayoutToStdOut();
       }
 
-      zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT, "localhost",
+      zkController = new ZkController(AbstractZkTestCase.ZOO_KEEPER_ADDRESS, TIMEOUT, "localhost",
           "8983", "/solr");
       zkController.updateCloudState();
       CloudState cloudInfo = zkController.getCloudState();
@@ -144,7 +140,7 @@
 
       AbstractZkTestCase.makeSolrZkNode();
 
-      SolrZkClient zkClient = new SolrZkClient(ZOO_KEEPER_ADDRESS, TIMEOUT);
+      SolrZkClient zkClient = new SolrZkClient(AbstractZkTestCase.ZOO_KEEPER_ADDRESS, TIMEOUT);
       String actualConfigName = "firstConfig";
 
       String shardsPath = "/collections/" + COLLECTION_NAME + "/config="
@@ -155,7 +151,7 @@
         zkClient.printLayoutToStdOut();
       }
       zkClient.close();
-      ZkController zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT,
+      ZkController zkController = new ZkController(AbstractZkTestCase.ZOO_KEEPER_ADDRESS,
TIMEOUT,
           "localhost", "8983", "/solr");
       try {
         String configName = zkController.readConfigName(COLLECTION_NAME);
@@ -181,7 +177,7 @@
 
       AbstractZkTestCase.makeSolrZkNode();
 
-      zkController = new ZkController(ZOO_KEEPER_ADDRESS, TIMEOUT, "localhost",
+      zkController = new ZkController(AbstractZkTestCase.ZOO_KEEPER_ADDRESS, TIMEOUT, "localhost",
           "8983", "/solr");
 
       zkController.uploadDirToCloud(new File("solr/conf"),

Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java?rev=901776&r1=901775&r2=901776&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkTestServer.java Thu Jan 21
17:05:30 2010
@@ -21,7 +21,7 @@
 import org.apache.zookeeper.server.ZooKeeperServerMain;
 
 public class ZkTestServer {
-  private static final int PORT = 2181;
+  private static final int PORT = 2323;
 
   protected ZKServerMain zkServer = new ZKServerMain();
 



Mime
View raw message