test: also assert deprecation warning after clusters have been closed.

tomcallahan · Apr 19, 2018 · 621a193 · 621a193
1 parent 1cb3a9d
commit 621a193
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java
@@ -220,6 +220,7 @@ public Settings transportClientSettings() {
 
         assertClusters(cluster0, cluster1, false);
         long seed = randomLong();
+        boolean shouldAssertSettingsDeprecationsAndWarnings = false;
         try {
             {
                 Random random = new Random(seed);
@@ -231,6 +232,7 @@ public Settings transportClientSettings() {
             }
             assertArrayEquals(cluster0.getNodeNames(), cluster1.getNodeNames());
             if (cluster0.getNodeNames().length > 0) {
+                shouldAssertSettingsDeprecationsAndWarnings = true;
                 assertSettingDeprecationsAndWarnings(new Setting<?>[]{NetworkModule.HTTP_ENABLED});
             }
             Iterator<Client> iterator1 = cluster1.getClients().iterator();
@@ -245,6 +247,9 @@ public Settings transportClientSettings() {
             cluster1.afterTest();
         } finally {
             IOUtils.close(cluster0, cluster1);
+            if (shouldAssertSettingsDeprecationsAndWarnings) {
+                assertSettingDeprecationsAndWarnings(new Setting<?>[]{NetworkModule.HTTP_ENABLED});
+            }
         }
     }