From a7a726700e76b4cbd17ef9e898e0975050aaa016 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 20 Jan 2015 09:53:08 -0800 Subject: [PATCH] Tests: Increase timeout for waiting on replicas for static index tests --- .../bwcompat/OldIndexBackwardsCompatibilityTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java b/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java index a79aa3ac9ec..ef850a12e95 100644 --- a/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java +++ b/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.rest.action.admin.indices.upgrade.UpgradeTest; @@ -194,7 +195,7 @@ public class OldIndexBackwardsCompatibilityTests extends StaticIndexBackwardComp ensureGreen("test"); assertAcked(client().admin().indices().prepareUpdateSettings("test").setSettings(ImmutableSettings.builder() .put("number_of_replicas", numReplicas)).execute().actionGet()); - ensureGreen("test"); // TODO: what is the proper way to wait for new replicas to recover? + ensureGreen(TimeValue.timeValueMinutes(1), "test"); // this can take a while when the number of replicas is high assertAcked(client().admin().indices().prepareUpdateSettings("test").setSettings(ImmutableSettings.builder() .put("number_of_replicas", 0))