Fix test bug in UpdateThreadPoolSettingsTests.

elastic · Nov 3, 2015 · a7bf06e · a7bf06e
1 parent d819930
commit a7bf06e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java b/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
@@ -49,7 +49,13 @@ public void testCorrectThreadPoolTypePermittedInSettings() throws InterruptedExc
                     .put("name", "testCorrectThreadPoolTypePermittedInSettings")
                     .put("threadpool." + threadPoolName + ".type", correctThreadPoolType.getType())
                     .build());
-            assertEquals(info(threadPool, threadPoolName).getThreadPoolType(), correctThreadPoolType);
+            ThreadPool.Info info = info(threadPool, threadPoolName);
+            if (ThreadPool.Names.SAME.equals(threadPoolName)) {
+                assertNull(info); // we don't report on the "same" threadpool
+            } else {
+                // otherwise check we have the expected type
+                assertEquals(info.getThreadPoolType(), correctThreadPoolType);
+            }
         } finally {
             terminateThreadPoolIfNeeded(threadPool);
         }