From 459b77478e96d5faa1c3b7be4294a760af7a01c5 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 28 Apr 2017 11:22:46 -0400 Subject: [PATCH] Test: get more information when sporadic NPE LicenseManagerServiceTests sometimes fails in jenkins, but fairly rarely. We don't get useful logs when it does. This cranks up the log level and adds some more assertions so we can better track down where the failure comes from. Relates to elastic/x-pack-elasticsearch#222 Original commit: elastic/x-pack-elasticsearch@3e08725fc79af3585ac4f7b68a4aadcc54068c19 --- .../license/LicensesManagerServiceTests.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java b/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java index 0a98f991ab6..a9dc86ee019 100644 --- a/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java +++ b/plugin/src/test/java/org/elasticsearch/license/LicensesManagerServiceTests.java @@ -6,11 +6,13 @@ package org.elasticsearch.license; import org.elasticsearch.action.ActionListener; +import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.xpack.XPackPlugin; import org.elasticsearch.xpack.XPackSettings; import org.elasticsearch.xpack.XPackSingleNodeTestCase; @@ -23,6 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; +@TestLogging("_root:DEBUG") // So we can get more logging for https://github.com/elastic/x-pack-elasticsearch/issues/222 public class LicensesManagerServiceTests extends XPackSingleNodeTestCase { @Override @@ -101,7 +104,11 @@ public class LicensesManagerServiceTests extends XPackSingleNodeTestCase { TestUtils.registerAndAckSignedLicenses(licenseService, tamperedLicense, LicensesStatus.INVALID); // ensure that the invalid license never made it to cluster state - LicensesMetaData licensesMetaData = clusterService.state().metaData().custom(LicensesMetaData.TYPE); + ClusterState state = clusterService.state(); + assertNotNull(state); + assertNotNull(state.metaData()); + assertNotNull(state.metaData().custom(LicensesMetaData.TYPE)); + LicensesMetaData licensesMetaData = state.metaData().custom(LicensesMetaData.TYPE); assertThat(licensesMetaData.getLicense(), not(equalTo(tamperedLicense))); }