소스 검색

Use right skip versions.

Closes #27570
Martijn van Groningen 7 년 전
부모
커밋
2a35b4ee2b

+ 2 - 2
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/200_top_hits_metric.yml

@@ -1,8 +1,8 @@
 ---
 "top_hits aggregation with nested documents":
   - skip:
-          version: "5.99.99 - "
-          reason: "5.x nodes don't include index or id in nested top hits"
+          version: " - 6.1.99"
+          reason: "<= 6.1 nodes don't always include index or id in nested top hits"
   - do:
       indices.create:
         index: my-index

+ 3 - 4
rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml

@@ -13,9 +13,8 @@ setup:
 ---
 "Nested inner hits":
     - skip:
-        # this will only run in a mixed cluster environment with at least 1 5.x node 
-        version: "5.99.99 - "
-        reason:  multiple types are not supported on 6.x indices onwards
+        version: " - 6.1.99"
+        reason: "<= 6.1 nodes don't always include index or id in nested inner hits"
     - do:
         index:
           index: test
@@ -35,7 +34,7 @@ setup:
     - match: { hits.hits.0._type: "type_1" }
     - match: { hits.hits.0._id: "1" }
     - match: { hits.hits.0.inner_hits.nested_field.hits.hits.0._index: "test" }
-    - match: { hits.hits.0.inner_hits.nested_field.hits.hits.0._type: "type1" }
+    - match: { hits.hits.0.inner_hits.nested_field.hits.hits.0._type: "type_1" }
     - match: { hits.hits.0.inner_hits.nested_field.hits.hits.0._id: "1" }
     - match: { hits.hits.0.inner_hits.nested_field.hits.hits.0._nested.field: "nested_field" }
     - match: { hits.hits.0.inner_hits.nested_field.hits.hits.0._nested.offset: 0 }