svn commit: r1615075 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java

[sh...@apache.org]

Author: shalin
Date: Fri Aug  1 12:06:52 2014
New Revision: 1615075

URL: http://svn.apache.org/r1615075
Log:
SOLR-6309: Increase timeouts for AsyncMigrateRouteKeyTest

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1615075&r1=1615074&r2=1615075&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Aug  1 12:06:52 2014
@@ -316,6 +316,8 @@ Other Changes
 
 * SOLR-6281: Made PostingsSolrHighlighter more configurable via subclass extension. (David Smiley)
 
+* SOLR-6309: Increase timeouts for AsyncMigrateRouteKeyTest. (shalin)
+
 ==================  4.9.0 ==================
 
 Versions of Major Components

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java?rev=1615075&r1=1615074&r2=1615075&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java Fri Aug  1 12:06:52 2014
@@ -34,6 +34,8 @@ public class AsyncMigrateRouteKeyTest ex
     schemaString = "schema15.xml";      // we need a string id
   }
 
+  private static final int MAX_WAIT_SECONDS = 2 * 60;
+
   @Override
   @Before
   public void setUp() throws Exception {
@@ -54,10 +56,10 @@ public class AsyncMigrateRouteKeyTest ex
     params.set("action", CollectionParams.CollectionAction.REQUESTSTATUS.toString());
     params.set(OverseerCollectionProcessor.REQUESTID, asyncId);
     // This task takes long enough to run. Also check for the current state of the task to be running.
-    message = sendStatusRequestWithRetry(params, 2);
+    message = sendStatusRequestWithRetry(params, 5);
     assertEquals("found " + asyncId + " in running tasks", message);
     // Now wait until the task actually completes successfully/fails.
-    message = sendStatusRequestWithRetry(params, 20);
+    message = sendStatusRequestWithRetry(params, MAX_WAIT_SECONDS);
     assertEquals("Task " + asyncId + " not found in completed tasks.",
         "found " + asyncId + " in completed tasks", message);
   }