Skip to content

Rest test fixes #27354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clintongormley merged 15 commits into from
Nov 14, 2017
Merged

Rest test fixes #27354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3de6c7e
REST: Rename ingest.processor.grok to ingest.processor_grok
clintongormley Nov 12, 2017
232bf82
REST: Rename render_search_template to indices.render_search_template
clintongormley Nov 12, 2017
6c9f83f
REST: Rename remote.info to cluster.remote_info
clintongormley Nov 12, 2017
2fae729
REST: Removed unneeded "headers" from bulk/10_basic.yml
clintongormley Nov 12, 2017
22721c6
REST: Fixed bad YAML comments
clintongormley Nov 12, 2017
2aa322d
REST: Force dummy scripts to be strings, not numbers
clintongormley Nov 12, 2017
9845d68
REST: Fix bad YAML in search/110_field_collapsing.yml
clintongormley Nov 12, 2017
d956913
REST: Adjust percentil tests to work with Perl number handling
clintongormley Nov 12, 2017
fc67d4d
Fixed ingest test to use ingest.processor_grok
clintongormley Nov 13, 2017
70fe301
Use approximate numeric matching in Perl to deal with float precision
clintongormley Nov 13, 2017
e70476e
Use indices.render_search_template in mustache tests
clintongormley Nov 13, 2017
853360b
Revert "Use indices.render_search_template in mustache tests"
clintongormley Nov 13, 2017
009a32c
Revert "REST: Rename render_search_template to indices.render_search_…
clintongormley Nov 13, 2017
5c0c2a8
Revert "REST: Removed unneeded "headers" from bulk/10_basic.yml"
clintongormley Nov 13, 2017
2ec50a2
Fixed use of remote.info in QA tests to use cluster.remote_info
clintongormley Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,6 @@ teardown:
---
"Test Grok Patterns Retrieval":
- do:
ingest.processor.grok: {}
ingest.processor_grok: {}
Copy link
Member

@javanna javanna Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wondering if you were the first one ever running these tests...

Copy link
Member

@javanna javanna Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I don't follow this change, why the underscore instead of the dot? the API is called ingest.processor.grok in the spec right? This should fail the build I think.

Copy link
Contributor Author

@clintongormley clintongormley Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I renamed ingest.processor.grok to ingest.processor_grok in the spec too, so this should work. The reason for the underscore instead of the dot is that an underscore returns a new namespace in the REST clients, but we have only one thing in this namespace, so makes more sense just to have it at the same level as the other ingest methods.

Copy link
Member

@javanna javanna Nov 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I see that now. And the name of the api didn't match the name of the file. All good. I am going to open a PR to validate that the name of the api matches the filename, I've seen enough of these errors.

- length: { patterns: 303 }
- match: { patterns.PATH: "(?:%{UNIXPATH}|%{WINPATH})" }
2 changes: 1 addition & 1 deletion qa/mixed-cluster/src/test/resources/rest-api-spec/test/10_parent_child.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@
# This suite is not needed for testing mixed clusters with minimum version 6.0.0 and higher,
# because join type should be used instead of _parent field.
- do:
remote.info: {}
cluster.remote_info: {}
- is_true: ''
4 changes: 2 additions & 2 deletions qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Fetch remote cluster info for existing cluster":

- do:
remote.info: {}
cluster.remote_info: {}
- match: { my_remote_cluster.connected: true }
- match: { my_remote_cluster.num_nodes_connected: 1}
- match: { my_remote_cluster.max_connections_per_cluster: 1}
Expand Down Expand Up @@ -37,7 +37,7 @@
- match: { hits.hits.0._index: "test_remote_cluster:test_index" }

- do:
remote.info: {}
cluster.remote_info: {}
- set: { my_remote_cluster.http_addresses.0: remote_http }
- match: { test_remote_cluster.http_addresses.0: $remote_http }

Expand Down
4 changes: 2 additions & 2 deletions ...ources/rest-api-spec/api/remote.info.json → ...est-api-spec/api/cluster.remote_info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"remote.info": {
"cluster.remote_info": {
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-remote-info.html",
"methods": ["GET"],
"url": {
Expand All @@ -9,4 +9,4 @@
},
"body": null
}
}
}
2 changes: 1 addition & 1 deletion ...t-api-spec/api/ingest.processor.grok.json → ...t-api-spec/api/ingest.processor_grok.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ingest.processor.grok": {
"ingest.processor_grok": {
"documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html",
"methods": [ "GET" ],
"url": {
Expand Down
2 changes: 1 addition & 1 deletion ...est-api-spec/test/remote.info/10_info.yml → ...spec/test/cluster.remote_info/10_info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
version: " - 5.3.99"
reason: this API doesn't exist in 5.3.x yet
- do:
remote.info: {}
cluster.remote_info: {}
- is_true: ''

3 changes: 2 additions & 1 deletion rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
"Exists type":
- skip:
version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node
# 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

- do:
Expand Down
3 changes: 2 additions & 1 deletion ...i-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_legacy_multi_type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
setup:

- skip:
version: "5.99.99 - " # this will only run in a mixed cluster environment with at least 1 5.x node
# 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

- do:
Expand Down
5 changes: 3 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
type: test
id: "1"
body: { "foo": "hello world" }
refresh: true # make this doc visible in index stats

# make this doc visible in index stats
refresh: true

- do:
get:
index: logs_search
Expand Down
3 changes: 2 additions & 1 deletion rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
"IDs":
- skip:
version: "5.99.99 - "# this will only run in a mixed cluster environment with at least 1 5.x node
# 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

- do:
Expand Down
210 changes: 100 additions & 110 deletions ...c/main/resources/rest-api-spec/test/search.aggregation/180_percentiles_tdigest_metric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,24 @@ setup:
percentiles:
field: double_field


- match: { hits.total: 4 }
- match: { hits.total: 4 }
- length: { hits.hits: 4 }
- match:
aggregations.percentiles_int.values:
"1.0": 2.5
"5.0": 8.500000000000002
"25.0": 38.5
"50.0": 76.0
"75.0": 113.5
"95.0": 143.49999999999997
"99.0": 149.5
- match:
aggregations.percentiles_double.values:
"1.0": 2.5
"5.0": 8.500000000000002
"25.0": 38.5
"50.0": 76.0
"75.0": 113.5
"95.0": 143.49999999999997
"99.0": 149.5

- match: { aggregations.percentiles_int.values.1\.0: 2.5 }
- match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_int.values.25\.0: 38.5 }
- match: { aggregations.percentiles_int.values.50\.0: 76.0 }
- match: { aggregations.percentiles_int.values.75\.0: 113.5 }
- match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
- match: { aggregations.percentiles_int.values.99\.0: 149.5 }

- match: { aggregations.percentiles_double.values.1\.0: 2.5 }
- match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_double.values.25\.0: 38.5 }
- match: { aggregations.percentiles_double.values.50\.0: 76.0 }
- match: { aggregations.percentiles_double.values.75\.0: 113.5 }
- match: { aggregations.percentiles_double.values.95\.0: 143.49999999999997 }
- match: { aggregations.percentiles_double.values.99\.0: 149.5 }

- do:
search:
Expand All @@ -102,24 +99,23 @@ setup:

- match: { hits.total: 4 }
- length: { hits.hits: 4 }
- match:
aggregations.percentiles_int.values:
"1.0": 2.5
"5.0": 8.500000000000002
"25.0": 38.5
"50.0": 76.0
"75.0": 113.5
"95.0": 143.49999999999997
"99.0": 149.5
- match:
aggregations.percentiles_double.values:
"1.0": 2.5
"5.0": 8.500000000000002
"25.0": 38.5
"50.0": 76.0
"75.0": 113.5
"95.0": 143.49999999999997
"99.0": 149.5

- match: { aggregations.percentiles_int.values.1\.0: 2.5 }
- match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_int.values.25\.0: 38.5 }
- match: { aggregations.percentiles_int.values.50\.0: 76.0 }
- match: { aggregations.percentiles_int.values.75\.0: 113.5 }
- match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
- match: { aggregations.percentiles_int.values.99\.0: 149.5 }

- match: { aggregations.percentiles_double.values.1\.0: 2.5 }
- match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_double.values.25\.0: 38.5 }
- match: { aggregations.percentiles_double.values.50\.0: 76.0 }
- match: { aggregations.percentiles_double.values.75\.0: 113.5 }
- match: { aggregations.percentiles_double.values.95\.0: 143.49999999999997 }
- match: { aggregations.percentiles_double.values.99\.0: 149.5 }


---
"Only aggs test":
Expand All @@ -138,24 +134,24 @@ setup:

- match: { hits.total: 4 }
- length: { hits.hits: 0 }
- match:
aggregations.percentiles_int.values:
"1.0": 2.5
"5.0": 8.500000000000002
"25.0": 38.5
"50.0": 76.0
"75.0": 113.5
"95.0": 143.49999999999997
"99.0": 149.5
- match:
aggregations.percentiles_double.values:
"1.0": 2.5
"5.0": 8.500000000000002
"25.0": 38.5
"50.0": 76.0
"75.0": 113.5
"95.0": 143.49999999999997
"99.0": 149.5

- match: { aggregations.percentiles_int.values.1\.0: 2.5 }
- match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_int.values.25\.0: 38.5 }
- match: { aggregations.percentiles_int.values.50\.0: 76.0 }
- match: { aggregations.percentiles_int.values.75\.0: 113.5 }
- match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
- match: { aggregations.percentiles_int.values.99\.0: 149.5 }

- match: { aggregations.percentiles_double.values.1\.0: 2.5 }
- match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_double.values.25\.0: 38.5 }
- match: { aggregations.percentiles_double.values.50\.0: 76.0 }
- match: { aggregations.percentiles_double.values.75\.0: 113.5 }
- match: { aggregations.percentiles_double.values.95\.0: 143.49999999999997 }
- match: { aggregations.percentiles_double.values.99\.0: 149.5 }



---
"Filtered test":
Expand All @@ -179,24 +175,22 @@ setup:

- match: { hits.total: 3 }
- length: { hits.hits: 3 }
- match:
aggregations.percentiles_int.values:
"1.0": 52.0
"5.0": 56.0
"25.0": 76.0
"50.0": 101.0
"75.0": 126.0
"95.0": 146.0
"99.0": 150.0
- match:
aggregations.percentiles_double.values:
"1.0": 52.0
"5.0": 56.0
"25.0": 76.0
"50.0": 101.0
"75.0": 126.0
"95.0": 146.0
"99.0": 150.0

- match: { aggregations.percentiles_int.values.1\.0: 52.0 }
- match: { aggregations.percentiles_int.values.5\.0: 56.0 }
- match: { aggregations.percentiles_int.values.25\.0: 76.0 }
- match: { aggregations.percentiles_int.values.50\.0: 101.0 }
- match: { aggregations.percentiles_int.values.75\.0: 126.0 }
- match: { aggregations.percentiles_int.values.95\.0: 146.0 }
- match: { aggregations.percentiles_int.values.99\.0: 150.0 }

- match: { aggregations.percentiles_double.values.1\.0: 52.0 }
- match: { aggregations.percentiles_double.values.5\.0: 56.0 }
- match: { aggregations.percentiles_double.values.25\.0: 76.0 }
- match: { aggregations.percentiles_double.values.50\.0: 101.0 }
- match: { aggregations.percentiles_double.values.75\.0: 126.0 }
- match: { aggregations.percentiles_double.values.95\.0: 146.0 }
- match: { aggregations.percentiles_double.values.99\.0: 150.0 }

---
"Missing field with missing param":
Expand All @@ -212,15 +206,14 @@ setup:

- match: { hits.total: 4 }
- length: { hits.hits: 4 }
- match:
aggregations.percentiles_missing.values:
"1.0": 1.0
"5.0": 1.0
"25.0": 1.0
"50.0": 1.0
"75.0": 1.0
"95.0": 1.0
"99.0": 1.0

- match: { aggregations.percentiles_missing.values.1\.0: 1.0 }
- match: { aggregations.percentiles_missing.values.5\.0: 1.0 }
- match: { aggregations.percentiles_missing.values.25\.0: 1.0 }
- match: { aggregations.percentiles_missing.values.50\.0: 1.0 }
- match: { aggregations.percentiles_missing.values.75\.0: 1.0 }
- match: { aggregations.percentiles_missing.values.95\.0: 1.0 }
- match: { aggregations.percentiles_missing.values.99\.0: 1.0 }

---
"Missing field without missing param":
Expand Down Expand Up @@ -253,15 +246,15 @@ setup:
- match: { hits.total: 4 }
- length: { hits.hits: 4 }
- match: { aggregations.percentiles_int.meta.foo: "bar" }
- match:
aggregations.percentiles_int.values:
"1.0": 2.5
"5.0": 8.500000000000002
"25.0": 38.5
"50.0": 76.0
"75.0": 113.5
"95.0": 143.49999999999997
"99.0": 149.5


- match: { aggregations.percentiles_int.values.1\.0: 2.5 }
- match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_int.values.25\.0: 38.5 }
- match: { aggregations.percentiles_int.values.50\.0: 76.0 }
- match: { aggregations.percentiles_int.values.75\.0: 113.5 }
- match: { aggregations.percentiles_int.values.95\.0: 143.49999999999997 }
- match: { aggregations.percentiles_int.values.99\.0: 149.5 }

---
"Invalid params test":
Expand Down Expand Up @@ -343,16 +336,14 @@ setup:

- match: { hits.total: 4 }
- length: { hits.hits: 4 }
- match:
aggregations.percentiles_int.values:
5.0: 8.500000000000002
25.0: 38.5
50.0: 76.0
- match:
aggregations.percentiles_double.values:
5.0: 8.500000000000002
25.0: 38.5
50.0: 76.0

- match: { aggregations.percentiles_int.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_int.values.25\.0: 38.5 }
- match: { aggregations.percentiles_int.values.50\.0: 76.0 }

- match: { aggregations.percentiles_double.values.5\.0: 8.500000000000002 }
- match: { aggregations.percentiles_double.values.25\.0: 38.5 }
- match: { aggregations.percentiles_double.values.50\.0: 76.0 }

---
"Non-keyed test":
Expand All @@ -370,14 +361,13 @@ setup:

- match: { hits.total: 4 }
- length: { hits.hits: 4 }
- match:
aggregations.percentiles_int.values:
- key: 5.0
value: 8.500000000000002
- key: 25.0
value: 38.5
- key: 50.0
value: 76.0

- match: { aggregations.percentiles_int.values.0.key: 5.0 }
- match: { aggregations.percentiles_int.values.0.value: 8.500000000000002 }
- match: { aggregations.percentiles_int.values.1.key: 25.0 }
- match: { aggregations.percentiles_int.values.1.value: 38.5 }
- match: { aggregations.percentiles_int.values.2.key: 50.0 }
- match: { aggregations.percentiles_int.values.2.value: 76.0 }



Loading