fix tests to not mix local transport and zen unicast disco

s1monw · s1monw · commit 0de007a33b33 · 2015-08-20T00:10:20.000+02:00
diff --git a/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java b/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java
@@ -36,6 +36,11 @@
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 public class SpecificMasterNodesIT extends ESIntegTestCase {
 
+    @Override
+    protected boolean forceNetwork() {
+        return true;
+    }
+
     protected final Settings.Builder settingsBuilder() {
         return Settings.builder().put("discovery.type", "zen");
     }
diff --git a/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java b/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java
@@ -50,6 +50,11 @@
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
 public class TransportIndexFailuresIT extends ESIntegTestCase {
 
+    @Override
+    protected boolean forceNetwork() {
+        return true;
+    }
+
     private static final Settings nodeSettings = Settings.settingsBuilder()
             .put("discovery.type", "zen") // <-- To override the local setting if set externally
             .put(FaultDetection.SETTING_PING_TIMEOUT, "1s") // <-- for hitting simulated network failures quickly
diff --git a/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
@@ -65,6 +65,7 @@
 import org.elasticsearch.snapshots.mockstore.MockRepository;
 import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.rest.FakeRestRequest;
+import org.elasticsearch.transport.TransportModule;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -96,9 +97,14 @@
 
 /**
  */
-@ClusterScope(scope = Scope.TEST, numDataNodes = 0)
+@ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
 public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCase {
 
+    @Override
+    protected boolean forceNetwork() {
+        return true; // TODO only restorePersistentSettingsTest needs this maybe factor out?
+    }
+
     @Test
     public void restorePersistentSettingsTest() throws Exception {
         logger.info("--> start 2 nodes");
