honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Marvel: Fix CleanerServiceTests when setting is equal to 0 

closes elastic/elasticsearch#1319

Original commit: elastic/x-pack-elasticsearch@2dd8d61376
This commit is contained in:
Tanguy Leroux 2016-01-18 15:01:35 +01:00
parent 01bc1f4124
commit d4afcf4e4e
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/cleaner/CleanerServiceTests.java
View File

@ -52,12 +52,14 @@ public class CleanerServiceTests extends ESTestCase {
} }
public void testRetentionUpdateAllowed() { public void testRetentionUpdateAllowed() {
TimeValue randomRetention = TimeValue.parseTimeValue(randomTimeValue(), null, "");
MarvelLicensee licensee = mock(MarvelLicensee.class); MarvelLicensee licensee = mock(MarvelLicensee.class);
when(licensee.allowUpdateRetention()).thenReturn(true); when(licensee.allowUpdateRetention()).thenReturn(true);
CleanerService service = new CleanerService(Settings.EMPTY, clusterSettings, threadPool, licensee); CleanerService service = new CleanerService(Settings.EMPTY, clusterSettings, threadPool, licensee);
service.setRetention(TimeValue.parseTimeValue("-1", null, ""));
assertThat(service.getRetention().getMillis(), equalTo(-1L));
TimeValue randomRetention = TimeValue.parseTimeValue(randomIntBetween(1, 1000) + "ms", null, "");
service.setRetention(randomRetention); service.setRetention(randomRetention);
assertThat(service.getRetention(), equalTo(randomRetention)); assertThat(service.getRetention(), equalTo(randomRetention));
@ -69,14 +71,27 @@ public class CleanerServiceTests extends ESTestCase {
} }
public void testRetentionUpdateBlocked() { public void testRetentionUpdateBlocked() {
TimeValue randomRetention = TimeValue.parseTimeValue(randomTimeValue(), null, "");
MarvelLicensee licensee = mock(MarvelLicensee.class); MarvelLicensee licensee = mock(MarvelLicensee.class);
when(licensee.allowUpdateRetention()).thenReturn(false); when(licensee.allowUpdateRetention()).thenReturn(true);
CleanerService service = new CleanerService(Settings.EMPTY, clusterSettings, threadPool, licensee); CleanerService service = new CleanerService(Settings.EMPTY, clusterSettings, threadPool, licensee);
try {
service.setRetention(TimeValue.parseTimeValue("-5000ms", null, ""));
fail("exception should have been thrown: negative retention are not allowed");
} catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("invalid history duration setting value"));
}
try {
service.setRetention(null);
fail("exception should have been thrown: null retention is not allowed");
} catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("history duration setting cannot be null"));
}
TimeValue randomRetention = TimeValue.parseTimeValue(randomIntBetween(1, 1000) + "ms", null, "");
when(licensee.allowUpdateRetention()).thenReturn(false);
try { try {
service.setRetention(randomRetention); service.setRetention(randomRetention);
fail("exception should have been thrown");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e.getMessage(), containsString("license does not allow the history duration setting to be updated to value")); assertThat(e.getMessage(), containsString("license does not allow the history duration setting to be updated to value"));
assertNull(service.getRetention()); assertNull(service.getRetention());