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 06:43:08 UTC
svn commit: r1580757 - in /lucene/dev/branches/lucene_solr_4_7: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/cloud/ solr/test-framework/
solr/test-framework/src/java/org/apache/solr/cloud/
Author: markrmiller
Date: Mon Mar 24 05:43:08 2014
New Revision: 1580757
URL: http://svn.apache.org/r1580757
Log:
tests: improve test
Modified:
lucene/dev/branches/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
lucene/dev/branches/lucene_solr_4_7/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Modified: lucene/dev/branches/lucene_solr_4_7/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1580757&r1=1580756&r2=1580757&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Mon Mar 24 05:43:08 2014
@@ -631,7 +631,7 @@ public class CollectionsAPIDistributedZk
// create new collections rapid fire
Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
- int cnt = random().nextInt(TEST_NIGHTLY ? 6 : 3) + 1;
+ int cnt = random().nextInt(TEST_NIGHTLY ? 6 : 1) + 1;
for (int i = 0; i < cnt; i++) {
int numShards = _TestUtil.nextInt(random(), 0, shardCount) + 1;
@@ -915,7 +915,7 @@ public class CollectionsAPIDistributedZk
public void run() {
// create new collections rapid fire
Map<String,List<Integer>> collectionInfos = new HashMap<String,List<Integer>>();
- int cnt = random().nextInt(TEST_NIGHTLY ? 13 : 3) + 1;
+ int cnt = random().nextInt(TEST_NIGHTLY ? 13 : 1) + 1;
for (int i = 0; i < cnt; i++) {
String collectionName = "awholynewstresscollection_" + name + "_" + i;
Modified: lucene/dev/branches/lucene_solr_4_7/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1580757&r1=1580756&r2=1580757&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Mon Mar 24 05:43:08 2014
@@ -319,7 +319,6 @@ public abstract class AbstractFullDistri
}
-
protected void waitForCollection(ZkStateReader reader, String collection, int slices) throws Exception {
// wait until shards have started registering...
int cnt = 30;
@@ -1719,12 +1718,6 @@ public abstract class AbstractFullDistri
}
- protected void runCollectionAdminCommand(ModifiableSolrParams params){
-
- ;
-
- }
-
protected void createCollection(Map<String,List<Integer>> collectionInfos,
String collectionName, int numShards, int numReplicas, int maxShardsPerNode, SolrServer client, String createNodeSetStr) throws SolrServerException, IOException {