diff --git a/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java b/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java index d839b12aadf..495f39ddaa3 100644 --- a/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java @@ -45,11 +45,11 @@ import static org.hamcrest.Matchers.equalTo; /** */ -@ClusterScope(scope=Scope.TEST, numNodes=0) +@ClusterScope(scope = Scope.TEST, numNodes = 0) public class ClusterRerouteTests extends AbstractIntegrationTest { private final ESLogger logger = Loggers.getLogger(ClusterRerouteTests.class); - + @Test public void rerouteWithCommands() throws Exception { @@ -156,8 +156,7 @@ public class ClusterRerouteTests extends AbstractIntegrationTest { logger.info("--> closing all nodes"); File shardLocation = cluster().getInstance(NodeEnvironment.class).shardLocations(new ShardId("test", 0))[0]; - - cluster().resetAllGateways(); + cluster().closeAllNodesAndReset(); logger.info("--> deleting the shard data [{}] ", shardLocation); diff --git a/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java index 847a4c980e1..4c646e7a8e4 100644 --- a/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java @@ -36,7 +36,6 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.gateway.Gateway; -import org.elasticsearch.junit.annotations.TestLogging; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.test.AbstractNodesTests; import org.junit.After; @@ -70,8 +69,7 @@ public class RecoveryPercolatorTests extends AbstractNodesTests { } closeAllNodes(); } - - + @Override protected Settings getClassDefaultSettings() { @@ -141,7 +139,7 @@ public class RecoveryPercolatorTests extends AbstractNodesTests { Client client = client("node1"); client.admin().indices().prepareCreate("test") - .setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); + .setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); logger.info("--> register a query"); client.prepareIndex("test", "_percolator", "kuku") @@ -272,14 +270,11 @@ public class RecoveryPercolatorTests extends AbstractNodesTests { @Test @Slow - @TestLogging("action.support.broadcast:TRACE") public void testSinglePercolator_recovery() throws Exception { percolatorRecovery(false); } @Test - // Need to omit org.elast - @TestLogging("action.percolate:TRACE") @Slow public void testMultiPercolator_recovery() throws Exception { percolatorRecovery(true);