Skip to content

Commit 44f0c1d

Browse files
committed
Unmute field collapsing rest tests
BWC tests can run now that master and 6x branch are aligned. Closes #32055
1 parent fa59bb1 commit 44f0c1d

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ setup:
1313
---
1414
"Nested inner hits":
1515
- skip:
16-
version: "all"
17-
reason: "https://github.com/elastic/elasticsearch/issues/32055"
18-
16+
version: " - 6.1.99"
17+
reason: "<= 6.1 nodes don't always include index or id in nested inner hits"
1918
- do:
2019
index:
2120
index: test
@@ -46,8 +45,8 @@ setup:
4645
"Nested doc version and seqIDs":
4746

4847
- skip:
49-
version: "all"
50-
reason: "https://github.com/elastic/elasticsearch/issues/32055"
48+
version: " - 6.3.99"
49+
reason: "object notation for docvalue_fields was introduced in 6.4"
5150

5251
- do:
5352
index:

rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ setup:
107107

108108
---
109109
"field collapsing and inner_hits":
110-
- skip:
111-
version: "all"
112-
reason: "https://github.com/elastic/elasticsearch/issues/32055"
113110

114111
- do:
115112
search:
@@ -149,9 +146,6 @@ setup:
149146

150147
---
151148
"field collapsing, inner_hits and maxConcurrentGroupRequests":
152-
- skip:
153-
version: "all"
154-
reason: "https://github.com/elastic/elasticsearch/issues/32055"
155149

156150
- do:
157151
search:
@@ -232,9 +226,6 @@ setup:
232226

233227
---
234228
"no hits and inner_hits":
235-
- skip:
236-
version: "all"
237-
reason: "https://github.com/elastic/elasticsearch/issues/32055"
238229

239230
- do:
240231
search:
@@ -249,9 +240,6 @@ setup:
249240

250241
---
251242
"field collapsing and multiple inner_hits":
252-
- skip:
253-
version: "all"
254-
reason: "https://github.com/elastic/elasticsearch/issues/32055"
255243

256244
- do:
257245
search:
@@ -304,9 +292,10 @@ setup:
304292

305293
---
306294
"field collapsing, inner_hits and version":
295+
307296
- skip:
308-
version: "all"
309-
reason: "https://github.com/elastic/elasticsearch/issues/32055"
297+
version: " - 6.1.0"
298+
reason: "bug fixed in 6.1.1"
310299

311300
- do:
312301
search:

0 commit comments

Comments
 (0)