Browse Source

Adjust REST tests now that #73023 is backported

Julie Tibshirani 4 years ago
parent
commit
b23dfe29d5

+ 0 - 1
rest-api-spec/build.gradle

@@ -207,7 +207,6 @@ tasks.named("yamlRestCompatTest").configure {
     'mtermvectors/30_mix_typeless_typeful/mtermvectors without types on an index that has types',
     'mtermvectors/30_mix_typeless_typeful/mtermvectors without types on an index that has types',
     'search/10_source_filtering/docvalue_fields with default format', //use_field_mapping change
     'search/10_source_filtering/docvalue_fields with default format', //use_field_mapping change
     'search/40_indices_boost/Indices boost using object', //indices_boost
     'search/40_indices_boost/Indices boost using object', //indices_boost
-    'search/110_field_collapsing/field collapsing and search_after', // temporarily disabled while we backport the change
     'search/150_rewrite_on_coordinator/Ensure that we fetch the document only once', //terms_lookup
     'search/150_rewrite_on_coordinator/Ensure that we fetch the document only once', //terms_lookup
     'search/171_terms_query_with_types/Terms Query with No.of terms exceeding index.max_terms_count should FAIL', //bulk
     'search/171_terms_query_with_types/Terms Query with No.of terms exceeding index.max_terms_count should FAIL', //bulk
     'search/260_parameter_validation/test size=-1 is deprecated', //size=-1 change
     'search/260_parameter_validation/test size=-1 is deprecated', //size=-1 change

+ 4 - 4
rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/110_field_collapsing.yml

@@ -235,8 +235,8 @@ setup:
 ---
 ---
 "field collapsing and search_after with invalid sort":
 "field collapsing and search_after with invalid sort":
   - skip:
   - skip:
-      version: " - 7.99.99"
-      reason: "support for collapsing with search_after not yet backported"
+      version: " - 7.13.99"
+      reason: "support for collapsing with search_after was added in 7.14"
   - do:
   - do:
       catch: /Cannot use \[collapse\] in conjunction with \[search_after\] unless the search is sorted on the same field. Multiple sort fields are not allowed./
       catch: /Cannot use \[collapse\] in conjunction with \[search_after\] unless the search is sorted on the same field. Multiple sort fields are not allowed./
       search:
       search:
@@ -258,8 +258,8 @@ setup:
 ---
 ---
 "field collapsing and search_after":
 "field collapsing and search_after":
   - skip:
   - skip:
-      version: " - 7.99.99"
-      reason: "support for collapsing with search_after not yet backported"
+      version: " - 7.13.99"
+      reason: "support for collapsing with search_after was added in 7.14"
   - do:
   - do:
       search:
       search:
         index: test
         index: test