fix ExceptionIT for version specific warnings

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Mar 24, 2022 · 4239622 · 4239622
1 parent b4b190e
commit 4239622
Showing 1 changed file with 5 additions and 19 deletions.
diff --git a/qa/mixed-cluster/src/test/java/org/opensearch/backwards/ExceptionIT.java b/qa/mixed-cluster/src/test/java/org/opensearch/backwards/ExceptionIT.java
@@ -12,31 +12,23 @@
 import org.opensearch.Version;
 import org.opensearch.client.Node;
 import org.opensearch.client.Request;
-import org.opensearch.client.RequestOptions;
 import org.opensearch.client.Response;
 import org.opensearch.client.ResponseException;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
 import org.opensearch.test.rest.yaml.ObjectPath;
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import static org.apache.http.HttpStatus.SC_NOT_FOUND;
 
 public class ExceptionIT extends OpenSearchRestTestCase {
-    private Set<String> assertedWarnings = new HashSet<>();
-
     public void testOpensearchException() throws Exception {
         logClusterNodes();
 
         Request request = new Request("GET", "/no_such_index");
 
-        String expectedWarning = "[GET /_cat/master] is deprecated! Use [GET /_cat/cluster_manager] instead.";
-        request.setOptions(expectWarnings(expectedWarning));
-
         for (Node node : client().getNodes()) {
             try {
                 client().setNodes(Collections.singletonList(node));
@@ -52,21 +44,15 @@ public void testOpensearchException() throws Exception {
         }
     }
 
-    private RequestOptions expectWarnings(String expectedWarning) {
-        final RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder();
-        if (!assertedWarnings.contains(expectedWarning)) {
-            builder.setWarningsHandler(w -> w.contains(expectedWarning) == false || w.size() != 1);
-            assertedWarnings.add(expectedWarning);
-        }
-        return builder.build();
-    }
-
     private void logClusterNodes() throws IOException {
         ObjectPath objectPath = ObjectPath.createFromResponse(client().performRequest(new Request("GET", "_nodes")));
         Map<String, ?> nodes = objectPath.evaluate("nodes");
         Request request = new Request("GET", "_cat/master?h=id");
-        String expectedWarning = "[GET /_cat/master] is deprecated! Use [GET /_cat/cluster_manager] instead.";
-        request.setOptions(expectWarnings(expectedWarning));
+        String inclusiveWarning = "[GET /_cat/master] is deprecated! Use [GET /_cat/cluster_manager] instead.";
+        request.setOptions(expectVersionSpecificWarnings(v -> {
+            v.current(inclusiveWarning);
+            v.compatible(inclusiveWarning);
+        }));
         String master = EntityUtils.toString(client().performRequest(request).getEntity()).trim();
         logger.info("cluster discovered: master id='{}'", master);
         for (String id : nodes.keySet()) {