move master node tests to cluster package, and force it to use zen disco always

modules/test/integration/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java

@@ -22,6 +22,7 @@ package org.elasticsearch.test.integration;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.Node;
 
@@ -40,6 +41,16 @@ public abstract class AbstractNodesTests {
 
     private Map<String, Client> clients = newHashMap();
 
+    private Settings defaultSettings = ImmutableSettings.Builder.EMPTY_SETTINGS;
+
+    public void putDefaultSettings(Settings.Builder settings) {
+        putDefaultSettings(settings.build());
+    }
+
+    public void putDefaultSettings(Settings settings) {
+        defaultSettings = ImmutableSettings.settingsBuilder().put(defaultSettings).put(settings).build();
+    }
+
     public Node startNode(String id) {
         return buildNode(id).start();
     }
@@ -64,6 +75,7 @@ public abstract class AbstractNodesTests {
         String settingsSource = getClass().getName().replace('.', '/') + ".yml";
         Settings finalSettings = settingsBuilder()
                 .loadFromClasspath(settingsSource)
+                .put(defaultSettings)
                 .put(settings)
                 .put("name", id)
                 .build();

modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java

@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elastic Search and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Elastic Search licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.test.integration.cluster;
+
+import org.elasticsearch.test.integration.AbstractNodesTests;
+import org.testng.annotations.BeforeClass;
+
+import static org.elasticsearch.common.settings.ImmutableSettings.*;
+
+/**
+ *
+ */
+public class AbstractZenNodesTests extends AbstractNodesTests {
+
+    @BeforeClass public void setUpZenDiscoSettings() {
+        // we force zen discovery here since it has specific handling for specific master / data nodes
+        // and disconnections
+        putDefaultSettings(settingsBuilder().put("discovery.type", "zen"));
+    }
+}

modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.test.integration.datanode;
+package org.elasticsearch.test.integration.cluster;
 
 import org.elasticsearch.action.UnavailableShardsException;
 import org.elasticsearch.action.index.IndexResponse;

modules/test/integration/src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java

@@ -17,10 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.test.integration.masternode;
+package org.elasticsearch.test.integration.cluster;
 
 import org.elasticsearch.discovery.MasterNotDiscoveredException;
-import org.elasticsearch.test.integration.AbstractNodesTests;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
@@ -31,7 +30,7 @@ import static org.hamcrest.Matchers.*;
 /**
  * @author kimchy (shay.banon)
  */
-public class SpecificMasterNodesTests extends AbstractNodesTests {
+public class SpecificMasterNodesTests extends AbstractZenNodesTests {
 
     @AfterMethod public void closeNodes() {
         closeAllNodes();

modules/test/integration/src/test/java/org/elasticsearch/test/integration/datanode/SimpleDataNodesTests.yml

@@ -1,6 +0,0 @@
-cluster:
-  routing:
-    schedule: 100ms
-index:
-  number_of_shards: 5
-  number_of_replicas: 1