From e3834da05e820f57bdc789c779a8beab11371e0f Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Sat, 29 Apr 2017 10:45:12 +0200 Subject: [PATCH] [TEST] Wait for trial license to be generated before running LicensesManagerServiceTests Many of the tests assume that the trial license has already been generated before the test gets to run. As this is asynchronously triggered upon node startup, however, there is no guarantee that trial license generation has completed before the tests get to execute, leading to null values when checking clusterService.state().metaData().custom(LicensesMetaData.TYPE). Original commit: elastic/x-pack-elasticsearch@d909c9ba951b5da61dfe0c2769318ab07a4a569f --- .../elasticsearch/license/LicensesManagerServiceTests.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java b/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java index a9dc86ee019..cb36d343d25 100644 --- a/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java @@ -16,6 +16,7 @@ import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.XPackSettings; import org.elasticsearch.xpack.XPackSingleNodeTestCase; +import org.junit.Before; import java.util.Collection; import java.util.Collections; @@ -50,6 +51,11 @@ public class LicensesManagerServiceTests extends XPackSingleNodeTestCase { return true; } + @Before + public void waitForTrialLicenseToBeGenerated() throws Exception { + assertBusy(() -> assertNotNull(getInstanceFromNode(ClusterService.class).state().metaData().custom(LicensesMetaData.TYPE))); + } + public void testStoreAndGetLicenses() throws Exception { LicenseService licenseService = getInstanceFromNode(LicenseService.class); ClusterService clusterService = getInstanceFromNode(ClusterService.class);