Testing: Properly terminate thread pools

Original commit: elastic/x-pack-elasticsearch@a16cbed365

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));
     }
 }

src/test/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStoreTests.java

@@ -60,8 +60,8 @@ public class FileUserPasswdStoreTests extends ElasticsearchTestCase {
     }
 
     @After
-    public void shutdown() {
+    public void shutdown() throws InterruptedException {
-        threadPool.shutdownNow();
+        terminate(threadPool);
     }
 
     @Test

src/test/java/org/elasticsearch/shield/authc/esusers/FileUserRolesStoreTests.java

@@ -59,8 +59,8 @@ public class FileUserRolesStoreTests extends ElasticsearchTestCase {
     }
 
     @After
-    public void shutdown() {
+    public void shutdown() throws InterruptedException {
-        threadPool.shutdownNow();
+        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) {
+            terminate(threadPool);
-                threadPool.shutdownNow();
-            }
         }
     }
 

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

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() {
+    public void shutdown() throws InterruptedException {
-        threadPool.shutdownNow();
+        terminate(threadPool);
     }
 
     protected abstract AbstractGroupToRoleMapper createMapper(Path file, ResourceWatcherService watcherService);

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) {
+            terminate(threadPool);
-                threadPool.shutdownNow();
-            }
         }
     }
 

src/test/java/org/elasticsearch/shield/signature/InternalSignatureServiceTests.java

@@ -49,8 +49,8 @@ public class InternalSignatureServiceTests extends ElasticsearchTestCase {
     }
 
     @After
-    public void shutdown() {
+    public void shutdown() throws InterruptedException {
-        threadPool.shutdownNow();
+        terminate(threadPool);
     }
 
     @Test