Skip to content

Commit 686503c

Browse files
Rest test fixes (#27354)
* REST: Rename ingest.processor.grok to ingest.processor_grok * REST: Rename remote.info to cluster.remote_info * REST: Fixed bad YAML comments * REST: Force dummy scripts to be strings, not numbers * REST: Fix bad YAML in search/110_field_collapsing.yml * REST: Adjust percentile tests to work with Perl number handling
1 parent cd9f26c commit 686503c

File tree

16 files changed

+239
-254
lines changed

16 files changed

+239
-254
lines changed

modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@ teardown:
158158
---
159159
"Test Grok Patterns Retrieval":
160160
- do:
161-
ingest.processor.grok: {}
161+
ingest.processor_grok: {}
162162
- length: { patterns: 303 }
163163
- match: { patterns.PATH: "(?:%{UNIXPATH}|%{WINPATH})" }

qa/mixed-cluster/src/test/resources/rest-api-spec/test/10_parent_child.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@
4848
# This suite is not needed for testing mixed clusters with minimum version 6.0.0 and higher,
4949
# because join type should be used instead of _parent field.
5050
- do:
51-
remote.info: {}
51+
cluster.remote_info: {}
5252
- is_true: ''

qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Fetch remote cluster info for existing cluster":
33

44
- do:
5-
remote.info: {}
5+
cluster.remote_info: {}
66
- match: { my_remote_cluster.connected: true }
77
- match: { my_remote_cluster.num_nodes_connected: 1}
88
- match: { my_remote_cluster.max_connections_per_cluster: 1}
@@ -37,7 +37,7 @@
3737
- match: { hits.hits.0._index: "test_remote_cluster:test_index" }
3838

3939
- do:
40-
remote.info: {}
40+
cluster.remote_info: {}
4141
- set: { my_remote_cluster.http_addresses.0: remote_http }
4242
- match: { test_remote_cluster.http_addresses.0: $remote_http }
4343

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"remote.info": {
2+
"cluster.remote_info": {
33
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html",
44
"methods": ["GET"],
55
"url": {
@@ -9,4 +9,4 @@
99
},
1010
"body": null
1111
}
12-
}
12+
}

rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor.grok.json renamed to rest-api-spec/src/main/resources/rest-api-spec/api/ingest.processor_grok.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"ingest.processor.grok": {
2+
"ingest.processor_grok": {
33
"documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html",
44
"methods": [ "GET" ],
55
"url": {

rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yml renamed to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
version: " - 5.3.99"
55
reason: this API doesn't exist in 5.3.x yet
66
- do:
7-
remote.info: {}
7+
cluster.remote_info: {}
88
- is_true: ''
99

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
"Exists type":
33
- skip:
4-
version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node
4+
# this will only run in a mixed cluster environment with at least 1 5.x node
5+
version: "5.99.99 - "
56
reason: multiple types are not supported on 6.x indices onwards
67

78
- do:

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
setup:
33

44
- skip:
5-
version: "5.99.99 - " # this will only run in a mixed cluster environment with at least 1 5.x node
5+
# this will only run in a mixed cluster environment with at least 1 5.x node
6+
version: "5.99.99 - "
67
reason: multiple types are not supported on 6.x indices onwards
78

89
- do:

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
type: test
1818
id: "1"
1919
body: { "foo": "hello world" }
20-
refresh: true # make this doc visible in index stats
21-
20+
# make this doc visible in index stats
21+
refresh: true
22+
2223
- do:
2324
get:
2425
index: logs_search

rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
"IDs":
33
- skip:
4-
version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node
4+
# this will only run in a mixed cluster environment with at least 1 5.x node
5+
version: "5.99.99 - "
56
reason: multiple types are not supported on 6.x indices onwards
67

78
- do:

0 commit comments

Comments
 (0)