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 2017/02/22 16:45:57 UTC

lucene-solr:branch_6x: SOLR-10164: DistributedVersionInfoTest needs to be hardened.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x f955213b2 -> b98afa455


SOLR-10164: DistributedVersionInfoTest needs to be hardened.

# Conflicts:
#	solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b98afa45
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b98afa45
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b98afa45

Branch: refs/heads/branch_6x
Commit: b98afa4554b14018f06a728efad4392381dd029d
Parents: f955213
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 16:34:33 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:43:55 2017 -0500

----------------------------------------------------------------------
 .../apache/solr/cloud/DistributedVersionInfoTest.java    | 11 +++++++----
 .../java/org/apache/solr/cloud/SolrCloudTestCase.java    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b98afa45/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
index b70cd5e..0394152 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java
@@ -201,10 +201,13 @@ public class DistributedVersionInfoTest extends SolrCloudTestCase {
             Thread.sleep(rand.nextInt(50)+1);
           } catch (InterruptedException e) {}
 
-          int docToDelete = rand.nextInt(docsSent.get())+1;
-          if (!deletedDocs.contains(docToDelete)) {
-            delI(String.valueOf(docToDelete));
-            deletedDocs.add(docToDelete);
+          int ds = docsSent.get();
+          if (ds > 0) {
+            int docToDelete = rand.nextInt(ds) + 1;
+            if (!deletedDocs.contains(docToDelete)) {
+              delI(String.valueOf(docToDelete));
+              deletedDocs.add(docToDelete);
+            }
           }
         }
       }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b98afa45/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
index 34dc8ac..180cf6e 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
@@ -70,7 +70,7 @@ import org.junit.Before;
  */
 public class SolrCloudTestCase extends SolrTestCaseJ4 {
 
-  public static final int DEFAULT_TIMEOUT = 30;
+  public static final int DEFAULT_TIMEOUT = 90;
 
   private static class Config {
     final String name;