test issues

javanna · Nov 20, 2023 · f25527a · f25527a
1 parent 3b5068d
commit f25527a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java b/...rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java
@@ -350,7 +350,7 @@ public ClientYamlTestResponse callApi(
             BiPredicate<ClientYamlSuiteRestApi, ClientYamlSuiteRestApi.Path> pathPredicate
         ) throws IOException {
             // on request, we need to replace index specifications by prefixing the remote cluster
-            if (shouldReplaceIndexWithRemote(apiName)) {
+            if (shouldReplaceIndexWithRemote(apiName, params)) {
                 String parameterName = "index";
                 if (apiName.equals("indices.resolve_index")) {
                     // in this specific api, the index parameter is called "name"
@@ -371,7 +371,7 @@ public ClientYamlTestResponse callApi(
             return super.callApi(apiName, params, entity, headers, nodeSelector, pathPredicate);
         }
 
-        private boolean shouldReplaceIndexWithRemote(String apiName) {
+        private boolean shouldReplaceIndexWithRemote(String apiName, Map<String, String> params) {
             if (apiName.equals("scroll")
                 || apiName.equals("clear_scroll")
                 || apiName.equals("async_search.get")
@@ -389,10 +389,7 @@ private boolean shouldReplaceIndexWithRemote(String apiName) {
 
             if (apiName.equals("search") || apiName.equals("msearch") || apiName.equals("async_search.submit")) {
                 final String testCandidateTestPath = testCandidate.getTestPath();
-                if (testCandidateTestPath.equals("search/350_point_in_time/basic")
-                    || testCandidateTestPath.equals("search/350_point_in_time/point-in-time with slicing")
-                    || testCandidateTestPath.equals("search/350_point_in_time/msearch")
-                    || testCandidateTestPath.equals("search/350_point_in_time/wildcard")
+                if (testCandidateTestPath.startsWith("search/350_point_in_time")
                     || testCandidateTestPath.equals("async_search/20-with-poin-in-time/Async search with point in time")) {
                     return false;
                 }

diff --git a/x-pack/qa/runtime-fields/build.gradle b/x-pack/qa/runtime-fields/build.gradle
@@ -74,6 +74,7 @@ subprojects {
           'search/115_multiple_field_collapsing/two levels fields collapsing', // Field collapsing on a runtime field does not work
           'search/111_field_collapsing_with_max_score/*', // Field collapsing on a runtime field does not work
           'field_caps/30_index_filter/Field caps with index filter', // We don't support filtering field caps on runtime fields. What should we do?
+          'search/350_point_in_time/point-in-time with index filter', // We don't support filtering pit on runtime fields.
           'aggregations/filters_bucket/cache busting', // runtime keyword does not support split_queries_on_whitespace
           'search/140_pre_filter_search_shards/pre_filter_shard_size with shards that have no hit',
           //completion suggester does not return options when the context field is a geo_point runtime field