lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1361315 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
Date Fri, 13 Jul 2012 18:10:06 GMT
Author: markrmiller
Date: Fri Jul 13 18:10:05 2012
New Revision: 1361315

URL: http://svn.apache.org/viewvc?rev=1361315&view=rev
Log:
revert accidental commit of this file

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1361315&r1=1361314&r2=1361315&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
(original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
Fri Jul 13 18:10:05 2012
@@ -137,9 +137,7 @@ public class BasicDistributedZkTest exte
     // setLoggingLevel(null);
 
     del("*:*");
-    CloudSolrServer server = new CloudSolrServer(zkServer.getZkAddress());
-    server.setDefaultCollection(DEFAULT_COLLECTION);
-    solrj = server;
+
     indexr(id,1, i1, 100, tlong, 100,t1,"now is the time for all good men"
             ,"foo_f", 1.414f, "foo_b", "true", "foo_d", 1.414d);
     indexr(id,2, i1, 50 , tlong, 50,t1,"to come to the aid of their country."
@@ -292,21 +290,21 @@ public class BasicDistributedZkTest exte
     query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.RESULTS);
     query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.QUERY);
 
-//    // TODO: This test currently fails because debug info is obtained only
-//    // on shards with matches.
-//    // query("q","matchesnothing","fl","*,score", "debugQuery", "true");
-//
-//    // would be better if these where all separate tests - but much, much
-//    // slower
-//    doOptimisticLockingAndUpdating();
-//    testMultipleCollections();
-//    testANewCollectionInOneInstance();
-//    testSearchByCollectionName();
-//    testANewCollectionInOneInstanceWithManualShardAssignement();
-//    testNumberOfCommitsWithCommitAfterAdd();
-//
-//    testUpdateProcessorsRunOnlyOnce("distrib-dup-test-chain-explicit");
-//    testUpdateProcessorsRunOnlyOnce("distrib-dup-test-chain-implicit");
+    // TODO: This test currently fails because debug info is obtained only
+    // on shards with matches.
+    // query("q","matchesnothing","fl","*,score", "debugQuery", "true");
+
+    // would be better if these where all separate tests - but much, much
+    // slower
+    doOptimisticLockingAndUpdating();
+    testMultipleCollections();
+    testANewCollectionInOneInstance();
+    testSearchByCollectionName();
+    testANewCollectionInOneInstanceWithManualShardAssignement();
+    testNumberOfCommitsWithCommitAfterAdd();
+
+    testUpdateProcessorsRunOnlyOnce("distrib-dup-test-chain-explicit");
+    testUpdateProcessorsRunOnlyOnce("distrib-dup-test-chain-implicit");
 
     testCollectionsAPI();
     
@@ -325,7 +323,7 @@ public class BasicDistributedZkTest exte
     
     // create new collections rapid fire
     Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
-    int cnt = atLeast(9);
+    int cnt = atLeast(3);
     for (int i = 0; i < cnt; i++) {
       ModifiableSolrParams params = new ModifiableSolrParams();
       params.set("action", CollectionAction.CREATE.toString());
@@ -530,7 +528,7 @@ public class BasicDistributedZkTest exte
   private void checkForCollection(String collectionName, int expectedSlices)
       throws Exception {
     // check for an expectedSlices new collection - we poll the state
-    long timeoutAt = System.currentTimeMillis() + 120000;
+    long timeoutAt = System.currentTimeMillis() + 60000;
     boolean found = false;
     boolean sliceMatch = false;
     while (System.currentTimeMillis() < timeoutAt) {



Mime
View raw message