Ignore warnings related to types deprecation in REST tests. (#35395)

elastic · Dec 18, 2018 · c1ed462 · c1ed462
1 parent 20883d1
commit c1ed462
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
@@ -300,8 +300,13 @@ void checkWarningHeaders(final List<String> warningHeaders) {
                      * This warning header will come back in the vast majority of our tests that create an index. Rather than rewrite our
                      * tests to assert this warning header, we assume that it is expected.
                      */
-                }
-                else if (expected.remove(message) == false) {
+                } else // noinspection StatementWithEmptyBody
+                    if (message.startsWith("[types removal]")) {
+                    /*
+                     * We skip warnings related to types deprecation so that we can continue to run the many
+                     * mixed-version tests that used typed APIs.
+                     */
+                } else if (expected.remove(message) == false) {
                     unexpected.add(header);
                 }
             } else {

diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java
@@ -128,6 +128,16 @@ public void testWarningHeaders() {
         }
     }
 
+    public void testIgnoreTypesWarnings() {
+        String legitimateWarning = DeprecationLogger.formatWarning("warning");
+        String typesWarning = DeprecationLogger.formatWarning("[types removal] " +
+            "The endpoint /{index}/{type}/_count is deprecated, use /{index}/_count instead.");
+
+        DoSection section = new DoSection(new XContentLocation(1, 1));
+        section.setExpectedWarningHeaders(singletonList("warning"));
+        section.checkWarningHeaders(Arrays.asList(legitimateWarning, typesWarning));
+    }
+
     public void testParseDoSectionNoBody() throws Exception {
         parser = createParser(YamlXContent.yamlXContent,
                 "get:\n" +