Skip to content

Add a new "contains" feature to yml test #34738

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
merged 1 commit into from
Oct 25, 2018
Merged

Add a new "contains" feature to yml test #34738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Matrix Aggs Plugin
#
"Matrix stats aggs loaded":
- skip:
reason: "contains is a newly added assertion"
Copy link
Member

@javanna javanna Oct 23, 2018

Choose a reason for hiding this comment

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

I believe the reason can be skipped when you specify a feature. it is required only when specifying versions

Copy link
Member

@javanna javanna Oct 25, 2018

Choose a reason for hiding this comment

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

@atorok ping not sure you have seen this comment

Copy link
Contributor Author

@alpar-t alpar-t Oct 25, 2018

Choose a reason for hiding this comment

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

Sorry @javanna I did not interpret that as something you would like me to change.
The reason is overly repetitive even if used with version, but it does seem to add some more context with someone not as familiar with this syntax. That's why I left it in.

Copy link
Member

@javanna javanna Oct 25, 2018

Choose a reason for hiding this comment

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

it's not a big deal, just that I think skip features contains is already self-explaining and adding a reason does not add value, but I am fine with keeping it. I did not mean that I wanted you to change it, I was ok with you replying that you are leaving it as-is, just so I know you've seen the comment ;)

features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"Module loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"Ingest common installed":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Expression scripts
#
"Expression loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Mustache scripts
#
"Mustache loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Painless Plugin
#
"Painless plugin loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ teardown:

---
"Module repository-url is loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Netty transport
#
"Netty loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions ...-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Azure Classic Discovery component
#
"Discovery Azure Classic loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Discovery EC2 component
#
"Discovery EC2 loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for Discovery GCE components
#
"Discovery GCE loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions ...ples/custom-suggester/src/test/resources/rest-api-spec/test/custom-suggester/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# tests that the custom suggester plugin is installed
---
"plugin loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions .../painless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for the painless whitelist example plugin
#
"Plugin loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/examples/rescore/src/test/resources/rest-api-spec/test/example-rescore/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for the expert scoring script example plugin
#
"Plugin loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions ...t-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for the expert scoring script example plugin
#
"Plugin loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions ...ns/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"Ingest attachment plugin installed":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"Ingest plugin installed":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions ...ins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"ingest-user-agent plugin installed":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for repository-azure
#
"Plugin repository-azure is loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for repository-gcs
#
"Plugin repository-gcs is loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Check plugin is installed
#
"Plugin loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions ...repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Check plugin is installed
#
"Plugin loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for repository-s3
#
"Plugin repository-s3 is loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
3 changes: 3 additions & 0 deletions plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for SMB Store component
#
"SMB Store loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down
4 changes: 3 additions & 1 deletion test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ public final class Features {
"stash_in_path",
"stash_path_replace",
"warnings",
"yaml"));
"yaml",
"contains"
));

private Features() {

Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/privileges/40_get_user_privs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ teardown:
---

"Test get_user_privileges for single role":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
headers: { Authorization: "Basic dGVzdC0xOjEyMzQ1Njc4" } # test-1
xpack.security.get_user_privileges: {}
Expand Down Expand Up @@ -261,6 +264,9 @@ teardown:
---

"Test get_user_privileges for merged roles":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
headers: { Authorization: "Basic dGVzdC0zOjEyMzQ1Njc4" } # test-3
xpack.security.get_user_privileges: {}
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/xpack/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Integration tests for monitoring
#
"X-Pack loaded":
- skip:
reason: "contains is a newly added assertion"
features: contains
- do:
cluster.state: {}

Expand Down