From b87beeb05fa16a6c5f6729a24cd640aa48e4d66d Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Tue, 29 Mar 2016 13:13:49 +0200 Subject: [PATCH] Rename update-by-query REST tests to update_by_query --- .../60_with_ingest.yaml | 4 ++-- .../70_throttle.yaml | 2 +- .../10_script.yaml | 12 ++++++------ .../20_broken.yaml | 2 +- .../30_timeout.yaml | 2 +- .../40_search_failure.yaml | 2 +- .../resources/rest-api-spec/api/update_by_query.json | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename modules/reindex/src/test/resources/rest-api-spec/test/{update-by-query => update_by_query}/60_with_ingest.yaml (92%) rename modules/reindex/src/test/resources/rest-api-spec/test/{update-by-query => update_by_query}/70_throttle.yaml (97%) rename qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/{update-by-query => update_by_query}/10_script.yaml (94%) rename qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/{update-by-query => update_by_query}/20_broken.yaml (95%) rename qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/{update-by-query => update_by_query}/30_timeout.yaml (96%) rename qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/{update-by-query => update_by_query}/40_search_failure.yaml (97%) diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update-by-query/60_with_ingest.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_with_ingest.yaml similarity index 92% rename from modules/reindex/src/test/resources/rest-api-spec/test/update-by-query/60_with_ingest.yaml rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_with_ingest.yaml index 8c857bda5eb..faff5bd5b57 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/update-by-query/60_with_ingest.yaml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_with_ingest.yaml @@ -1,5 +1,5 @@ --- -"Update a document using update-by-query": +"Update a document using update_by_query": - do: ingest.put_pipeline: id: "test_ingest" @@ -25,7 +25,7 @@ indices.refresh: {} - do: - update-by-query: + update_by_query: index: twitter refresh: true pipeline: test_ingest diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update-by-query/70_throttle.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_throttle.yaml similarity index 97% rename from modules/reindex/src/test/resources/rest-api-spec/test/update-by-query/70_throttle.yaml rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_throttle.yaml index f0e75b8b2d5..7f9b7efce5c 100644 --- a/modules/reindex/src/test/resources/rest-api-spec/test/update-by-query/70_throttle.yaml +++ b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_throttle.yaml @@ -29,7 +29,7 @@ indices.refresh: {} - do: - update-by-query: + update_by_query: index: test scroll_size: 1 requests_per_second: 1 diff --git a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/10_script.yaml b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/10_script.yaml similarity index 94% rename from qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/10_script.yaml rename to qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/10_script.yaml index a5a8554615a..00c6e814eed 100644 --- a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/10_script.yaml +++ b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/10_script.yaml @@ -1,5 +1,5 @@ --- -"Update a document using update-by-query": +"Update a document using update_by_query": - do: index: index: twitter @@ -10,7 +10,7 @@ indices.refresh: {} - do: - update-by-query: + update_by_query: index: twitter refresh: true body: @@ -46,7 +46,7 @@ indices.refresh: {} - do: - update-by-query: + update_by_query: refresh: true index: twitter body: @@ -91,7 +91,7 @@ indices.refresh: {} - do: - update-by-query: + update_by_query: refresh: true index: twitter body: @@ -114,7 +114,7 @@ - do: catch: /Invalid fields added to ctx \[junk\]/ - update-by-query: + update_by_query: index: twitter body: script: @@ -133,7 +133,7 @@ - do: catch: /Modifying \[_id\] not allowed/ - update-by-query: + update_by_query: index: twitter body: script: diff --git a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/20_broken.yaml b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/20_broken.yaml similarity index 95% rename from qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/20_broken.yaml rename to qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/20_broken.yaml index c6134aef334..66f9cfe5456 100644 --- a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/20_broken.yaml +++ b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/20_broken.yaml @@ -11,7 +11,7 @@ - do: catch: request - update-by-query: + update_by_query: index: twitter refresh: true body: diff --git a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/30_timeout.yaml b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/30_timeout.yaml similarity index 96% rename from qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/30_timeout.yaml rename to qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/30_timeout.yaml index 2a291bf0541..e6bdd73757b 100644 --- a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/30_timeout.yaml +++ b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/30_timeout.yaml @@ -11,7 +11,7 @@ - do: catch: request_timeout - update-by-query: + update_by_query: index: twitter refresh: true search_timeout: 10ms diff --git a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/40_search_failure.yaml b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/40_search_failure.yaml similarity index 97% rename from qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/40_search_failure.yaml rename to qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/40_search_failure.yaml index 9b8ba43f4a8..748e5cd15e0 100644 --- a/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update-by-query/40_search_failure.yaml +++ b/qa/smoke-test-reindex-with-groovy/src/test/resources/rest-api-spec/test/update_by_query/40_search_failure.yaml @@ -11,7 +11,7 @@ - do: catch: request - update-by-query: + update_by_query: index: source body: query: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json index e6048efd35d..2409420fdd5 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json @@ -192,7 +192,7 @@ "scroll_size": { "type": "integer", "defaut_value": 100, - "description": "Size on the scroll request powering the update-by-query" + "description": "Size on the scroll request powering the update_by_query" }, "wait_for_completion": { "type" : "boolean",