Add @multicast annotation to disable multicast tests by default.

s1monw · s1monw · commit e7a606d63f1b · 2015-08-20T10:17:57.000+02:00
We only run multicast tests now when we explicitly state it. A working
multicast env is required which is not always the case.
diff --git a/core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityIT.java
@@ -33,7 +33,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
         return Settings.builder()
                 .put(super.nodeSettings(nodeOrdinal))
                 .put("transport.tcp.port", 9380 + nodeOrdinal)
-                .put("discovery.zen.ping.multicast.enabled", false)
                 .put("discovery.zen.ping.unicast.hosts", "localhost:9380,localhost:9381,localhost:9390,localhost:9391")
                 .build();
     }
@@ -43,7 +42,6 @@ protected Settings externalNodeSettings(int nodeOrdinal) {
         return Settings.settingsBuilder()
                 .put(super.externalNodeSettings(nodeOrdinal))
                 .put("transport.tcp.port", 9390 + nodeOrdinal)
-                .put("discovery.zen.ping.multicast.enabled", false)
                 .put("discovery.zen.ping.unicast.hosts", "localhost:9380,localhost:9381,localhost:9390,localhost:9391")
                 .build();
     }
diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
@@ -143,12 +143,15 @@ private List<String> startUnicastCluster(int numberOfNodes, @Nullable int[] unic
             .put("discovery.zen.join_timeout", "10s")  // still long to induce failures but to long so test won't time out
             .put(DiscoverySettings.PUBLISH_TIMEOUT, "1s") // <-- for hitting simulated network failures quickly
             .put("http.enabled", false) // just to make test quicker
+            .put("transport.host", "127.0.0.1") // only bind on one IF we use v4 here by default
+            .put("transport.bind_host", "127.0.0.1")
+            .put("transport.publish_host", "127.0.0.1")
             .put("gateway.local.list_timeout", "10s") // still long to induce failures but to long so test won't time out
             .put("plugin.types", MockTransportService.TestPlugin.class.getName())
             .build();
 
     private void configureCluster(int numberOfNodes, int minimumMasterNode) throws ExecutionException, InterruptedException {
-        if (randomBoolean()) {
+        if (randomBoolean() && canUseMuticast()) {
             configureMulticastCluster(numberOfNodes, minimumMasterNode);
         } else {
             configureUnicastCluster(numberOfNodes, null, minimumMasterNode);
diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingIT.java b/core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingIT.java
@@ -33,6 +33,7 @@
 import org.elasticsearch.discovery.zen.ping.PingContextProvider;
 import org.elasticsearch.discovery.zen.ping.ZenPing;
 import org.elasticsearch.node.service.NodeService;
+import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
@@ -45,6 +46,7 @@
 
 import static org.hamcrest.Matchers.equalTo;
 
+@ESIntegTestCase.Multicast
 public class MulticastZenPingIT extends ESTestCase {
 
     private Settings buildRandomMulticast(Settings settings) {
diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java
@@ -648,7 +648,6 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent
 
     private Tuple<Settings, Environment> buildInitialSettings() throws IOException {
         Settings settings = settingsBuilder()
-                .put("discovery.zen.ping.multicast.enabled", false)
                 .put("http.enabled", true)
                 .put("path.home", createTempDir()).build();
         return InternalSettingsPreparer.prepareSettings(settings, false);
diff --git a/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java b/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java
@@ -2003,4 +2003,25 @@ private static boolean isSuiteScopedTest(Class<?> clazz) {
     @Retention(RetentionPolicy.RUNTIME)
     @Inherited
     public @interface SuppressNetworkMode {}
+
+    /**
+     * Annotation used to set if working multicast is required to run the test.
+     * By default, tests annotated with @Multicast won't be executed.
+     * Set -Dtests.multicast=true when running test to launch multicast tests
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Inherited
+    @TestGroup(enabled = false, sysProperty = "tests.multicast")
+    public @interface Multicast {
+    }
+
+
+    /**
+     * Returns true if tests can use multicast. Default is false.
+     * To disable an entire test use {@link org.elasticsearch.test.ESIntegTestCase.Multicast} instead
+     */
+    protected boolean canUseMuticast() {
+        return Boolean.parseBoolean(System.getProperty("tests.multicast", "false"));
+    }
+
 }
diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
@@ -70,7 +70,7 @@ public class TribeIT extends ESIntegTestCase {
     public static void setupSecondCluster() throws Exception {
         ESIntegTestCase.beforeClass();
         // create another cluster
-        cluster2 = new InternalTestCluster(internalCluster().getNodeMode(), randomLong(), createTempDir(), 2, 2, Strings.randomBase64UUID(getRandom()), 0, false, SECOND_CLUSTER_NODE_PREFIX);
+        cluster2 = new InternalTestCluster(InternalTestCluster.configuredNodeMode(), randomLong(), createTempDir(), 2, 2, Strings.randomBase64UUID(getRandom()), 0, false, SECOND_CLUSTER_NODE_PREFIX);
         cluster2.beforeTest(getRandom(), 0.1);
         cluster2.ensureAtLeastNumDataNodes(2);
     }
diff --git a/pom.xml b/pom.xml
@@ -103,6 +103,7 @@
         <tests.rest.spec></tests.rest.spec>
         <tests.rest.load_packaged></tests.rest.load_packaged>
         <tests.network></tests.network>
+        <tests.multicast></tests.multicast>
         <tests.cluster></tests.cluster>
         <tests.filter></tests.filter>
         <env.ES_TEST_LOCAL></env.ES_TEST_LOCAL>

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public class TribeIT extends ESIntegTestCase {`
`70`	`70`	`public static void setupSecondCluster() throws Exception {`
`71`	`71`	`ESIntegTestCase.beforeClass();`
`72`	`72`	`// create another cluster`
`73`		`- cluster2 = new InternalTestCluster(internalCluster().getNodeMode(), randomLong(), createTempDir(), 2, 2, Strings.randomBase64UUID(getRandom()), 0, false, SECOND_CLUSTER_NODE_PREFIX);`
	`73`	`+ cluster2 = new InternalTestCluster(InternalTestCluster.configuredNodeMode(), randomLong(), createTempDir(), 2, 2, Strings.randomBase64UUID(getRandom()), 0, false, SECOND_CLUSTER_NODE_PREFIX);`
`74`	`74`	`cluster2.beforeTest(getRandom(), 0.1);`
`75`	`75`	`cluster2.ensureAtLeastNumDataNodes(2);`
`76`	`76`	`}`