test: Assert deprecated http.enebled setting warning

martijnvg · martijnvg · commit 3fccf062a326 · 2018-04-19T13:47:35.000+02:00
Closes #29603
diff --git a/modules/tribe/src/test/java/org/elasticsearch/tribe/TribeServiceTests.java b/modules/tribe/src/test/java/org/elasticsearch/tribe/TribeServiceTests.java
@@ -216,9 +216,13 @@ public void testTribeNodeDeprecation() throws IOException {
         }
         try (Node node = new MockNode(settings.build(), MockTribePlugin.classpathPlugins)) {
             if (tribeServiceEnable) {
-                assertWarnings("tribe nodes are deprecated in favor of cross-cluster search and will be removed in Elasticsearch 7.0.0");
+                assertSettingDeprecationsAndWarnings(
+                    new Setting<?>[]{NetworkModule.HTTP_ENABLED},
+                    "tribe nodes are deprecated in favor of cross-cluster search and will be removed in Elasticsearch 7.0.0"
+                );
             }
         }
+        assertSettingDeprecationsAndWarnings(new Setting<?>[]{NetworkModule.HTTP_ENABLED});
     }
 
     static class MergableCustomMetaData1 extends TestCustomMetaData

Original file line number	Diff line number	Diff line change
`@@ -216,9 +216,13 @@ public void testTribeNodeDeprecation() throws IOException {`
`216`	`216`	`}`
`217`	`217`	`try (Node node = new MockNode(settings.build(), MockTribePlugin.classpathPlugins)) {`
`218`	`218`	`if (tribeServiceEnable) {`
`219`		`- assertWarnings("tribe nodes are deprecated in favor of cross-cluster search and will be removed in Elasticsearch 7.0.0");`
	`219`	`+ assertSettingDeprecationsAndWarnings(`
	`220`	`+ new Setting<?>[]{NetworkModule.HTTP_ENABLED},`
	`221`	`+ "tribe nodes are deprecated in favor of cross-cluster search and will be removed in Elasticsearch 7.0.0"`
	`222`	`+ );`
`220`	`223`	`}`
`221`	`224`	`}`
	`225`	`+ assertSettingDeprecationsAndWarnings(new Setting<?>[]{NetworkModule.HTTP_ENABLED});`
`222`	`226`	`}`
`223`	`227`
`224`	`228`	`static class MergableCustomMetaData1 extends TestCustomMetaData`