From 2bc48a48062e08d78559dc4cd64bb300b90c21d1 Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Sun, 7 Dec 2014 22:10:11 +0100 Subject: [PATCH] Tests: move RecoverAfterNodesTests to org.elasticsearch.gateway.local and increase BLOCK_WAIT_TIMEOUT to 10s The tests were still in org.elasticsearch.gateway.none but the none gateway was removed. --- .../gateway/{none => local}/RecoverAfterNodesTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename src/test/java/org/elasticsearch/gateway/{none => local}/RecoverAfterNodesTests.java (99%) diff --git a/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java b/src/test/java/org/elasticsearch/gateway/local/RecoverAfterNodesTests.java similarity index 99% rename from src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java rename to src/test/java/org/elasticsearch/gateway/local/RecoverAfterNodesTests.java index ad15174e7ef..9119ad0554c 100644 --- a/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/RecoverAfterNodesTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.gateway.none; +package org.elasticsearch.gateway.local; import com.google.common.collect.ImmutableSet; import org.elasticsearch.client.Client; @@ -31,7 +31,7 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.hasItem; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) public class RecoverAfterNodesTests extends ElasticsearchIntegrationTest { - private final static TimeValue BLOCK_WAIT_TIMEOUT = TimeValue.timeValueSeconds(1); + private final static TimeValue BLOCK_WAIT_TIMEOUT = TimeValue.timeValueSeconds(10); public ImmutableSet waitForNoBlocksOnNode(TimeValue timeout, Client nodeClient) throws InterruptedException { long start = System.currentTimeMillis();