don't clear gateways in reroute test

- also remove test logging from percolator
This commit is contained in:
Shay Banon 2013-09-21 01:55:11 +02:00
parent 52e9e753e6
commit c6eebf0515
2 changed files with 5 additions and 11 deletions

View File

@ -157,7 +157,6 @@ public class ClusterRerouteTests extends AbstractIntegrationTest {
logger.info("--> closing all nodes"); logger.info("--> closing all nodes");
File shardLocation = cluster().getInstance(NodeEnvironment.class).shardLocations(new ShardId("test", 0))[0]; File shardLocation = cluster().getInstance(NodeEnvironment.class).shardLocations(new ShardId("test", 0))[0];
cluster().resetAllGateways();
cluster().closeAllNodesAndReset(); cluster().closeAllNodesAndReset();
logger.info("--> deleting the shard data [{}] ", shardLocation); logger.info("--> deleting the shard data [{}] ", shardLocation);

View File

@ -36,7 +36,6 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.gateway.Gateway; import org.elasticsearch.gateway.Gateway;
import org.elasticsearch.junit.annotations.TestLogging;
import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.node.internal.InternalNode;
import org.elasticsearch.test.AbstractNodesTests; import org.elasticsearch.test.AbstractNodesTests;
import org.junit.After; import org.junit.After;
@ -72,7 +71,6 @@ public class RecoveryPercolatorTests extends AbstractNodesTests {
} }
@Override @Override
protected Settings getClassDefaultSettings() { protected Settings getClassDefaultSettings() {
return settingsBuilder().put("gateway.type", "local").build(); return settingsBuilder().put("gateway.type", "local").build();
@ -272,14 +270,11 @@ public class RecoveryPercolatorTests extends AbstractNodesTests {
@Test @Test
@Slow @Slow
@TestLogging("action.support.broadcast:TRACE")
public void testSinglePercolator_recovery() throws Exception { public void testSinglePercolator_recovery() throws Exception {
percolatorRecovery(false); percolatorRecovery(false);
} }
@Test @Test
// Need to omit org.elast
@TestLogging("action.percolate:TRACE")
@Slow @Slow
public void testMultiPercolator_recovery() throws Exception { public void testMultiPercolator_recovery() throws Exception {
percolatorRecovery(true); percolatorRecovery(true);