From 3f9f0fcadb897d88189554eb45ef802836265be0 Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Tue, 17 Feb 2015 09:49:22 +0100 Subject: [PATCH] Testing: Properly terminate thread pools Original commit: elastic/x-pack-elasticsearch@a16cbed36558f9906b6e16725a62179f70da28c8 --- .../elasticsearch/shield/VersionCompatibilityTests.java | 6 ++++++ .../shield/authc/esusers/FileUserPasswdStoreTests.java | 4 ++-- .../shield/authc/esusers/FileUserRolesStoreTests.java | 8 +++----- .../elasticsearch/shield/authc/ldap/LdapRealmTest.java | 4 ++-- .../support/ldap/AbstractGroupToRoleMapperTests.java | 4 ++-- .../shield/authz/store/FileRolesStoreTests.java | 4 +--- .../shield/signature/InternalSignatureServiceTests.java | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java b/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java index 09038d62e79..e49a5aea9bd 100644 --- a/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java +++ b/src/test/java/org/elasticsearch/shield/VersionCompatibilityTests.java @@ -69,5 +69,11 @@ public class VersionCompatibilityTests extends ElasticsearchTestCase { * since es core 1.5.0 introduced the AliasesRequest interface. */ assertThat("Remove special treatment for IndicesAliasesRequest and GetAliasesRequest", Version.CURRENT.onOrBefore(Version.V_1_4_2), is(true)); + + /** + * see https://github.com/elasticsearch/elasticsearch/pull/9508 + * CheckFileCommand has been moved into ES-Core, please check the supported versions in the PR, if it can be removed completely + */ + assertThat("Remove built-in CheckFileCommand", Version.CURRENT.onOrBefore(Version.V_1_4_2), is(true)); } } diff --git a/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStoreTests.java b/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStoreTests.java index 1911dff5218..55ce6be603a 100644 --- a/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStoreTests.java +++ b/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStoreTests.java @@ -60,8 +60,8 @@ public class FileUserPasswdStoreTests extends ElasticsearchTestCase { } @After - public void shutdown() { - threadPool.shutdownNow(); + public void shutdown() throws InterruptedException { + terminate(threadPool); } @Test diff --git a/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserRolesStoreTests.java b/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserRolesStoreTests.java index fdf3fc88bfd..4676d640629 100644 --- a/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserRolesStoreTests.java +++ b/src/test/java/org/elasticsearch/shield/authc/esusers/FileUserRolesStoreTests.java @@ -59,8 +59,8 @@ public class FileUserRolesStoreTests extends ElasticsearchTestCase { } @After - public void shutdown() { - threadPool.shutdownNow(); + public void shutdown() throws InterruptedException { + terminate(threadPool); } @Test @@ -239,9 +239,7 @@ public class FileUserRolesStoreTests extends ElasticsearchTestCase { FileUserRolesStore store = new FileUserRolesStore(config, watcherService); assertThat(store.roles("user"), equalTo(Strings.EMPTY_ARRAY)); } finally { - if (threadPool != null) { - threadPool.shutdownNow(); - } + terminate(threadPool); } } diff --git a/src/test/java/org/elasticsearch/shield/authc/ldap/LdapRealmTest.java b/src/test/java/org/elasticsearch/shield/authc/ldap/LdapRealmTest.java index f6af3ebb3aa..9932d92061f 100644 --- a/src/test/java/org/elasticsearch/shield/authc/ldap/LdapRealmTest.java +++ b/src/test/java/org/elasticsearch/shield/authc/ldap/LdapRealmTest.java @@ -45,9 +45,9 @@ public class LdapRealmTest extends LdapTest { } @After - public void shutdown() { + public void shutdown() throws InterruptedException { resourceWatcherService.stop(); - threadPool.shutdownNow(); + terminate(threadPool); } @Test diff --git a/src/test/java/org/elasticsearch/shield/authc/support/ldap/AbstractGroupToRoleMapperTests.java b/src/test/java/org/elasticsearch/shield/authc/support/ldap/AbstractGroupToRoleMapperTests.java index 1e196cc8a8e..9e1d6ebbf04 100644 --- a/src/test/java/org/elasticsearch/shield/authc/support/ldap/AbstractGroupToRoleMapperTests.java +++ b/src/test/java/org/elasticsearch/shield/authc/support/ldap/AbstractGroupToRoleMapperTests.java @@ -51,8 +51,8 @@ public abstract class AbstractGroupToRoleMapperTests extends ElasticsearchTestCa } @After - public void shutdown() { - threadPool.shutdownNow(); + public void shutdown() throws InterruptedException { + terminate(threadPool); } protected abstract AbstractGroupToRoleMapper createMapper(Path file, ResourceWatcherService watcherService); diff --git a/src/test/java/org/elasticsearch/shield/authz/store/FileRolesStoreTests.java b/src/test/java/org/elasticsearch/shield/authz/store/FileRolesStoreTests.java index 43eb1952a92..cac28260818 100644 --- a/src/test/java/org/elasticsearch/shield/authz/store/FileRolesStoreTests.java +++ b/src/test/java/org/elasticsearch/shield/authz/store/FileRolesStoreTests.java @@ -174,9 +174,7 @@ public class FileRolesStoreTests extends ElasticsearchTestCase { if (watcherService != null) { watcherService.stop(); } - if (threadPool != null) { - threadPool.shutdownNow(); - } + terminate(threadPool); } } diff --git a/src/test/java/org/elasticsearch/shield/signature/InternalSignatureServiceTests.java b/src/test/java/org/elasticsearch/shield/signature/InternalSignatureServiceTests.java index 7775a55210e..39dd8fcc64a 100644 --- a/src/test/java/org/elasticsearch/shield/signature/InternalSignatureServiceTests.java +++ b/src/test/java/org/elasticsearch/shield/signature/InternalSignatureServiceTests.java @@ -49,8 +49,8 @@ public class InternalSignatureServiceTests extends ElasticsearchTestCase { } @After - public void shutdown() { - threadPool.shutdownNow(); + public void shutdown() throws InterruptedException { + terminate(threadPool); } @Test