Skip to content

Commit 8dbf800

Browse files
rgsriramSriram Ganesh
andauthored
Remove skip tags for version 7.x from yamlRestTests (#17919)
--------- Signed-off-by: Sriram Ganesh <[email protected]> Signed-off-by: Sriram Ganesh <[email protected]> Co-authored-by: Sriram Ganesh <[email protected]>
1 parent 37878a6 commit 8dbf800

File tree

99 files changed

+91
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+91
-581
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ Copyright OpenSearch Contributors. See [NOTICE](NOTICE.txt) for details.
6161
OpenSearch is a registered trademark of Amazon Web Services.
6262

6363
OpenSearch includes certain Apache-licensed Elasticsearch code from Elasticsearch B.V. and other source code. Elasticsearch B.V. is not the source of that other source code. ELASTICSEARCH is a registered trademark of Elasticsearch B.V.
64+

modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
"get cluster stats returns analysis stats":
33

4-
- skip:
5-
version: " - 7.6.99"
6-
reason: "analysis stats are added for v7.7.0"
74

85
- do:
96
cluster.stats: {}

modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ setup:
2222

2323
---
2424
"Test use_field":
25-
- skip:
26-
version: " - 7.1.99"
27-
reason: "Implemented in 7.2"
2825
- do:
2926
search:
3027
index: test

modules/geo/src/yamlRestTest/resources/rest-api-spec/test/geo_shape/230_composite.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ setup:
8383
index: [test, other]
8484
---
8585
"Simple Composite aggregation with GeoTile grid":
86-
- skip:
87-
version: " - 7.4.99"
88-
reason: geotile_grid is not supported until 7.5.0
8986
- do:
9087
search:
9188
rest_total_hits_as_int: true
@@ -127,9 +124,6 @@ setup:
127124

128125
---
129126
"Simple Composite aggregation with geotile grid add aggregate after":
130-
- skip:
131-
version: " - 7.4.99"
132-
reason: geotile_grid is not supported until 7.5.0
133127
- do:
134128
search:
135129
index: test

modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
"Script errors contain position":
3-
- skip:
4-
version: " - 7.7.0"
5-
reason: "position introduced in 7.7"
3+
64

75
- do:
86
catch: /compile error/

modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,7 @@
500500

501501
---
502502
"Script Score With Highlight":
503-
- skip:
504-
version: " - 7.4.0"
505-
reason: "highlight for script_score was introduced in 7.4.1"
503+
506504

507505
- do:
508506
indices.create:

modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# Integration tests for ScriptScoreQuery using Painless
22

3-
setup:
4-
- skip:
5-
version: " - 7.1.99"
6-
reason: "random score function of script score was added in 7.2"
7-
83
---
94
"Random score function with _seq_no field":
105
- do:

modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
setup:
2-
- skip:
3-
version: " - 7.1.99"
4-
reason: "added in 7.2.0"
5-
62
- do:
73
indices.create:
84
index: test

modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
setup:
2-
- skip:
3-
version: " - 7.1.99"
4-
reason: "added in 7.2.0"
52

63
- do:
74
indices.create:

modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ setup:
2828

2929
---
3030
teardown:
31-
- skip:
32-
version: " - 7.6.99"
33-
reason: "implemented in 7.7.0"
31+
3432

3533
- do:
3634
cluster.put_settings:
@@ -68,9 +66,7 @@ teardown:
6866

6967
---
7068
"HasChild disallow expensive queries":
71-
- skip:
72-
version: " - 7.6.99"
73-
reason: "implemented in 7.7.0"
69+
7470

7571
### Update setting to false
7672
- do:

modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ setup:
3030

3131
---
3232
teardown:
33-
- skip:
34-
version: " - 7.6.99"
35-
reason: "implemented in 7.7.0"
33+
3634

3735
- do:
3836
cluster.put_settings:
@@ -100,9 +98,7 @@ teardown:
10098

10199
---
102100
"HasChild disallow expensive queries":
103-
- skip:
104-
version: " - 7.6.99"
105-
reason: "implemented in 7.7.0"
101+
106102

107103
### Update setting to false
108104
- do:

modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
22
setup:
3-
- skip:
4-
version: " - 7.5.99"
5-
reason: "The bug was corrected from 7.6"
63

74
- do:
85
indices.create:
@@ -46,9 +43,7 @@ setup:
4643

4744
---
4845
teardown:
49-
- skip:
50-
version: " - 7.6.99"
51-
reason: "implemented in 7.7.0"
46+
5247

5348
- do:
5449
cluster.put_settings:
@@ -58,9 +53,6 @@ teardown:
5853

5954
---
6055
"Test two sub-queries with only one having inner_hits":
61-
- skip:
62-
version: " - 7.5.99"
63-
reason: "The bug was corrected from 7.6"
6456

6557
- do:
6658
search:
@@ -87,9 +79,7 @@ teardown:
8779

8880
---
8981
"HasParent disallow expensive queries":
90-
- skip:
91-
version: " - 7.6.99"
92-
reason: "implemented in 7.7.0"
82+
9383

9484
### Update setting to false
9585
- do:

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,6 @@
277277
---
278278
"Limit by size":
279279
- skip:
280-
version: " - 7.2.99"
281-
reason: "deprecation warnings only emitted on 7.3+"
282280
features: allowed_warnings
283281

284282
- do:
@@ -365,9 +363,6 @@
365363

366364
---
367365
"Limit by max_docs in URL":
368-
- skip:
369-
version: " - 7.2.99"
370-
reason: "max_docs introduced in 7.3.0"
371366

372367
- do:
373368
index:
@@ -408,9 +403,6 @@
408403

409404
---
410405
"Limit by max_docs in body":
411-
- skip:
412-
version: " - 7.2.99"
413-
reason: "max_docs introduced in 7.3.0"
414406

415407
- do:
416408
index:

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848

4949
---
5050
"invalid max_docs fails":
51-
- skip:
52-
version: " - 7.2.99"
53-
reason: "max_docs introduced in 7.3.0"
5451

5552
- do:
5653
index:
@@ -68,9 +65,7 @@
6865

6966
---
7067
"both max_docs and size fails":
71-
- skip:
72-
version: " - 7.2.99"
73-
reason: "max_docs introduced in 7.3.0"
68+
7469

7570
- do:
7671
index:
@@ -89,9 +84,7 @@
8984

9085
---
9186
"max_docs shoule be greater than slices":
92-
- skip:
93-
version: " - 7.2.99"
94-
reason: "max_docs introduced in 7.3.0"
87+
9588

9689
- do:
9790
index:

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@
113113

114114
---
115115
"invalid max_docs in body fails":
116-
- skip:
117-
version: " - 7.2.99"
118-
reason: "max_docs introduced in 7.3.0"
116+
119117

120118
- do:
121119
index:
@@ -134,9 +132,7 @@
134132

135133
---
136134
"max_docs shoule be greater than slices":
137-
- skip:
138-
version: " - 7.2.99"
139-
reason: "max_docs introduced in 7.3.0"
135+
140136

141137
- do:
142138
index:
@@ -156,9 +152,7 @@
156152

157153
---
158154
"invalid max_docs in URL fails":
159-
- skip:
160-
version: " - 7.2.99"
161-
reason: "max_docs introduced in 7.3.0"
155+
162156

163157
- do:
164158
index:
@@ -177,9 +171,7 @@
177171

178172
---
179173
"inconsistent max_docs and size fails":
180-
- skip:
181-
version: " - 7.2.99"
182-
reason: "max_docs introduced in 7.3.0"
174+
183175

184176
- do:
185177
index:
@@ -199,9 +191,7 @@
199191

200192
---
201193
"inconsistent max_docs in body and max_docs in URL fails":
202-
- skip:
203-
version: " - 7.2.99"
204-
reason: "max_docs introduced in 7.3.0"
194+
205195

206196
- do:
207197
index:

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
---
3535
"Sorting and size combined":
3636
- skip:
37-
version: " - 7.2.99"
38-
reason: "size deprecation warnings only emitted on 7.3+, but sort deprecated in 7.6"
3937
features: allowed_warnings
4038

4139
- do:
@@ -125,8 +123,6 @@
125123
---
126124
"Sorting and max_docs in body combined":
127125
- skip:
128-
version: " - 7.5.99"
129-
reason: "max_docs introduced in 7.3.0, but sort deprecated in 7.6"
130126
features: "allowed_warnings"
131127

132128
- do:
@@ -172,8 +168,6 @@
172168
---
173169
"Sorting deprecated wait_for_completion false":
174170
- skip:
175-
version: " - 7.5.99"
176-
reason: "sort deprecated in 7.6"
177171
features: "allowed_warnings"
178172

179173
- do:
@@ -206,9 +200,6 @@
206200

207201
---
208202
"max_docs in URL":
209-
- skip:
210-
version: " - 7.2.99"
211-
reason: "max_docs introduced in 7.3.0"
212203

213204
- do:
214205
index:

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,6 @@
285285

286286
---
287287
"Reindex from remote with max_docs":
288-
- skip:
289-
version: " - 7.2.99"
290-
reason: "max_docs introduced in 7.3.0"
291288

292289
- do:
293290
index:

modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,6 @@
216216
---
217217
"Limit by size":
218218
- skip:
219-
version: " - 7.2.99"
220-
reason: "deprecation warnings only emitted on 7.3+"
221219
features: allowed_warnings
222220

223221
- do:
@@ -278,9 +276,6 @@
278276

279277
---
280278
"Limit by max_docs in URL":
281-
- skip:
282-
version: " - 7.2.99"
283-
reason: "max_docs introduced in 7.3.0"
284279

285280
- do:
286281
index:
@@ -308,9 +303,6 @@
308303

309304
---
310305
"Limit by max_docs in body":
311-
- skip:
312-
version: " - 7.2.99"
313-
reason: "max_docs introduced in 7.3.0"
314306

315307
- do:
316308
index:

0 commit comments

Comments
 (0)