From cb84bf688861cbfd7641a1822b10d849fb888d11 Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Fri, 1 Aug 2014 12:06:52 +0000 Subject: [PATCH] SOLR-6309: Increase timeouts for AsyncMigrateRouteKeyTest git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1615075 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 ++ .../org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index bf570657e3b..f90cd70644a 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -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 diff --git a/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java index c26df681505..5ce9b9e287e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java @@ -34,6 +34,8 @@ public class AsyncMigrateRouteKeyTest extends MigrateRouteKeyTest { 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 extends MigrateRouteKeyTest { 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); }