Skip to content

Commit 231a63f

Browse files
authored
Remove useless version checks in REST tests. (#30165)
Many tests are added with a version check so that they do not run against a version that doesn't have the feature yet. Master is 7.0, so all tests that do not run against 6.0+ can be removed and the version check can be removed on all tests that always run on 6.0+.
1 parent 7358946 commit 231a63f

File tree

74 files changed

+4
-734
lines changed

Some content is hidden

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

74 files changed

+4
-734
lines changed

modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
"Custom normalizer with illegal filter in request":
33
# Tests analyze api with normalizer. This is in the analysis-common module
44
# because there are no filters that support multiTermAware
5-
- skip:
6-
version: " - 5.99.99"
7-
reason: normalizer support in 6.0.0
85
- do:
96
catch: bad_request
107
indices.analyze:

modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
"Synonym filter with char_filter":
22
# Tests analyze with synonym and char_filter. This is in the analysis-common module
33
# because there are no char filters in core.
4-
- skip:
5-
version: " - 5.99.99"
6-
reason: to support synonym same analysis chain were added in 6.0.0
74
- do:
85
indices.create:
96
index: test_synonym_with_charfilter

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ setup:
1313

1414
---
1515
"Parent/child inner hits":
16-
- skip:
17-
version: " - 5.5.99"
18-
reason: parent-join was added in 5.6.
19-
2016
- do:
2117
index:
2218
index: test

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ setup:
5959

6060
---
6161
"Test basic":
62-
- skip:
63-
version: " - 5.5.99"
64-
reason: parent-join was added in 5.6
65-
6662
- do:
6763
search:
6864
body: { sort: ["join_field", "_id"] }
@@ -104,10 +100,6 @@ setup:
104100

105101
---
106102
"Test parent_id query":
107-
- skip:
108-
version: " - 5.5.99"
109-
reason: parent-join was added in 5.6.
110-
111103
- do:
112104
search:
113105
body:

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
---
99
"no query fails":
1010

11-
- skip:
12-
version: " - 5.99.99"
13-
reason: explicit query is required since 6.0.0
14-
1511
- do:
1612
catch: /query is missing/
1713
delete_by_query:

qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
---
22
"Get simple field caps from remote cluster":
3-
- skip:
4-
version: " - 5.4.99"
5-
reason: this uses a new API functionality that has been added in 5.5.0
6-
73
- do:
84
indices.create:
95
index: field_caps_index_2

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525

2626
---
2727
"Empty _id":
28-
- skip:
29-
version: " - 5.3.0"
30-
reason: empty IDs were not rejected until 5.3.1
3128
- do:
3229
bulk:
3330
refresh: true
@@ -62,11 +59,6 @@
6259
---
6360
"empty action":
6461

65-
- skip:
66-
version: " - 5.4.99"
67-
reason: confusing exception messaged caused by empty object fixed in 5.5.0
68-
features: ["headers"]
69-
7062
- do:
7163
catch: /Malformed action\/metadata line \[3\], expected FIELD_NAME but found \[END_OBJECT\]/
7264
headers:

rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,6 @@
129129
---
130130
"Multiple alias names":
131131

132-
- skip:
133-
version: " - 5.99.99"
134-
reason: multiple aliases are supported only from 6.0.0 on
135-
136132
- do:
137133
indices.create:
138134
index: test
@@ -265,10 +261,6 @@
265261
---
266262
"Alias sorting":
267263

268-
- skip:
269-
version: " - 5.0.99"
270-
reason: sorting was introduced in 5.1.0
271-
272264
- do:
273265
indices.create:
274266
index: test_index

rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,6 @@
160160
161161
---
162162
"Test cat indices sort":
163-
- skip:
164-
version: " - 5.0.99"
165-
reason: sorting was introduced in 5.1.0
166163

167164
- do:
168165
indices.create:

rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@
6060
6161
---
6262
"Additional disk information":
63-
- skip:
64-
version: " - 5.5.99"
65-
reason: additional disk info added in 5.6.0
66-
6763
- do:
6864
cat.nodes:
6965
h: diskAvail,diskTotal,diskUsed,diskUsedPercent
@@ -92,10 +88,6 @@
9288
9389
---
9490
"Test cat nodes output with full_id set":
95-
- skip:
96-
version: " - 5.0.0"
97-
reason: The full_id setting was rejected in 5.0.0 see #21266
98-
9991

10092
- do:
10193
cat.nodes:

0 commit comments

Comments
 (0)