From d74f3f7264dc5539d8c6ba790a6f014036fee5f7 Mon Sep 17 00:00:00 2001 From: Eric Hartmann Date: Mon, 27 Feb 2017 09:36:05 +0100 Subject: [PATCH] Reenabling tests on cluster --- .../src/test/java/it/serverSystem/ClusterTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java b/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java index 146f856d0c8..f2f495a8390 100644 --- a/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java +++ b/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java @@ -55,10 +55,13 @@ public class ClusterTest { /** * SONAR-7899 */ + @Test public void secondary_nodes_do_not_write_to_datastores_at_startup() throws Exception { // start "startup leader", which creates and populates datastores Orchestrator orchestrator = Orchestrator.builderEnv() .setServerProperty("sonar.cluster.enabled", "true") + .setServerProperty("sonar.cluster.name", "secondary_nodes_do_not_write_to_datastores_at_startup") + .setServerProperty("sonar.cluster.port_autoincrement", "true") .setServerProperty("sonar.cluster.web.startupLeader", "true") .setServerProperty("sonar.log.level", "TRACE") .addPlugin(ItUtils.xooPlugin()) @@ -80,6 +83,7 @@ public class ClusterTest { orchestrator.stop(); } + @Test public void start_cluster_of_elasticsearch_and_web_nodes() throws IOException { Orchestrator elasticsearch = null; Orchestrator web = null; @@ -88,6 +92,8 @@ public class ClusterTest { ElasticsearchStartupWatcher esWatcher = new ElasticsearchStartupWatcher(); elasticsearch = Orchestrator.builderEnv() .setServerProperty("sonar.cluster.enabled", "true") + .setServerProperty("sonar.cluster.name", "start_cluster_of_elasticsearch_and_web_nodes") + .setServerProperty("sonar.cluster.port_autoincrement", "true") .setServerProperty("sonar.cluster.web.disabled", "true") .setServerProperty("sonar.cluster.ce.disabled", "true") .setStartupLogWatcher(esWatcher) @@ -98,6 +104,8 @@ public class ClusterTest { web = Orchestrator.builderEnv() .setServerProperty("sonar.cluster.enabled", "true") + .setServerProperty("sonar.cluster.name", "start_cluster_of_elasticsearch_and_web_nodes") + .setServerProperty("sonar.cluster.port_autoincrement", "true") .setServerProperty("sonar.cluster.web.startupLeader", "true") .setServerProperty("sonar.cluster.search.disabled", "true") .setServerProperty("sonar.cluster.search.hosts", "localhost:" + esWatcher.port) -- 2.39.5