github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 17:34:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix tests to not mix local transport and zen unicast disco

Browse source
This commit is contained in:
Simon Willnauer 2015-08-20 00:29:00 +02:00
parent 0de007a33b
commit f466a842c6
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java
View file

@ -68,6 +68,11 @@ import static org.hamcrest.Matchers.notNullValue;
@ClusterScope(scope = Scope.TEST, numDataNodes = 0) @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
public class ClusterServiceIT extends ESIntegTestCase { public class ClusterServiceIT extends ESIntegTestCase {
@Override
protected boolean forceNetwork() {
return true; // TODO only testLocalNodeMasterListenerCallbacks needs this - maybe factor out?
}
@Test @Test
public void testTimeoutUpdateTask() throws Exception { public void testTimeoutUpdateTask() throws Exception {
Settings settings = settingsBuilder() Settings settings = settingsBuilder()

1
core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
View file

@ -72,6 +72,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
@ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0) @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
@LuceneTestCase.AwaitsFix(bugUrl = "this one is just beyond nuts")
public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase {
private static final TimeValue DISRUPTION_HEALING_OVERHEAD = TimeValue.timeValueSeconds(40); // we use 30s as timeout in many places. private static final TimeValue DISRUPTION_HEALING_OVERHEAD = TimeValue.timeValueSeconds(40); // we use 30s as timeout in many places.