From 72c614373ac32436ffc839a25fd8120943e27fe4 Mon Sep 17 00:00:00 2001 From: Areek Zillur Date: Sun, 25 Jan 2015 14:32:37 -0500 Subject: [PATCH] [TEST] ensure feature registration on same node Original commit: elastic/x-pack-elasticsearch@434f3dff8e184cd226e2aa5206bc88ce40745e53 --- .../license/plugin/AbstractLicensesServiceTests.java | 9 +++++---- .../license/plugin/LicensesClientServiceTests.java | 9 ++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesServiceTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesServiceTests.java index 74d294f0239..782d9cf5040 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesServiceTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/AbstractLicensesServiceTests.java @@ -179,12 +179,13 @@ public abstract class AbstractLicensesServiceTests extends AbstractLicensesInteg } protected LicensesClientService licensesClientService() { - return internalCluster().getInstance(LicensesClientService.class, node); + final InternalTestCluster clients = internalCluster(); + return internalCluster().getInstance(LicensesClientService.class, clients.getMasterName()); } - protected LicensesService randomLicensesService() { - String randomNode = randomFrom(nodes); - return internalCluster().getInstance(LicensesService.class, randomNode); + protected LicensesService licensesService() { + final InternalTestCluster clients = internalCluster(); + return internalCluster().getInstance(LicensesService.class, clients.getMasterName()); } protected static ClusterService masterClusterService() { diff --git a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java index a99c77c22c1..6bb21e26b36 100644 --- a/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/plugin/LicensesClientServiceTests.java @@ -12,7 +12,6 @@ import org.elasticsearch.license.plugin.core.LicensesClientService; import org.elasticsearch.license.plugin.core.LicensesManagerService; import org.elasticsearch.license.plugin.core.LicensesService; import org.elasticsearch.license.plugin.core.LicensesStatus; -import org.junit.Ignore; import org.junit.Test; import java.util.*; @@ -232,7 +231,7 @@ public class LicensesClientServiceTests extends AbstractLicensesServiceTests { // multiple client registration with null trial license and then different expiry signed license final LicensesManagerService masterLicensesManagerService = masterLicensesManagerService(); - final LicensesService licensesService = randomLicensesService(); + final LicensesService licensesService = licensesService(); String feature1 = "feature1"; String feature2 = "feature2"; final TestTrackingClientListener clientListener1 = new TestTrackingClientListener(feature1); @@ -264,7 +263,7 @@ public class LicensesClientServiceTests extends AbstractLicensesServiceTests { // multiple client registration: one with trial license and another with signed license (different expiry duration) final LicensesManagerService masterLicensesManagerService = masterLicensesManagerService(); - final LicensesService licensesService = randomLicensesService(); + final LicensesService licensesService = licensesService(); String feature1 = "feature1"; String feature2 = "feature2"; final TestTrackingClientListener clientListener1 = new TestTrackingClientListener(feature1); @@ -294,7 +293,7 @@ public class LicensesClientServiceTests extends AbstractLicensesServiceTests { public void testMultipleClientTrialLicenseRegistration() throws Exception { // multiple client registration: both with trail license of different expiryDuration - final LicensesService licensesService = randomLicensesService(); + final LicensesService licensesService = licensesService(); String feature1 = "feature1"; String feature2 = "feature2"; final TestTrackingClientListener clientListener1 = new TestTrackingClientListener(feature1); @@ -347,7 +346,7 @@ public class LicensesClientServiceTests extends AbstractLicensesServiceTests { @Test public void testRandomActionSequenceMultipleFeature() throws Exception { - LicensesService licensesService = randomLicensesService(); + LicensesService licensesService = licensesService(); LicensesManagerService masterLicensesManagerService = masterLicensesManagerService(); Map> clientListenersWithActions = new HashMap<>();