From a4b634e60ecfb2a34f13a75bb82a35de9208a945 Mon Sep 17 00:00:00 2001 From: Lee Hinman Date: Thu, 25 Oct 2018 11:53:31 -0600 Subject: [PATCH] Remove unnecessary "acknowledge: true" statements in REST tests --- .../resources/rest-api-spec/test/ilm/10_basic.yml | 13 ------------- .../rest-api-spec/test/ilm/20_move_to_step.yml | 9 --------- .../resources/rest-api-spec/test/ilm/30_retry.yml | 5 ----- .../test/ilm/40_explain_lifecycle.yml | 14 -------------- .../rest-api-spec/test/ilm/60_operation_mode.yml | 4 ---- .../test/ilm/60_remove_policy_for_index.yml | 14 -------------- 6 files changed, 59 deletions(-) diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/10_basic.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/10_basic.yml index 81af39839ee..dd0ab626b53 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/10_basic.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/10_basic.yml @@ -17,7 +17,6 @@ setup: policy: "my_timeseries_lifecycle" - do: - acknowlege: true ilm.put_lifecycle: policy: "my_timeseries_lifecycle" body: | @@ -43,7 +42,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_timeseries_lifecycle" - match: { my_timeseries_lifecycle.version: 1 } @@ -52,7 +50,6 @@ setup: - match: { my_timeseries_lifecycle.policy.phases.delete.minimum_age: "30s" } - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_timeseries_lifecycle" @@ -64,7 +61,6 @@ setup: --- "Test Policy Update": - do: - acknowlege: true ilm.put_lifecycle: policy: "my_timeseries_lifecycle" body: | @@ -90,7 +86,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_timeseries_lifecycle" - match: { my_timeseries_lifecycle.version: 1 } @@ -114,7 +109,6 @@ setup: index.lifecycle.name: "my_moveable_timeseries_lifecycle" - do: - acknowlege: true ilm.put_lifecycle: policy: "my_timeseries_lifecycle" body: | @@ -140,7 +134,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_timeseries_lifecycle" - match: { my_timeseries_lifecycle.version: 2 } @@ -149,16 +142,13 @@ setup: - match: { my_timeseries_lifecycle.policy.phases.delete.minimum_age: "600s" } - do: - acknowledge: true indices.delete: index: my_index - do: - acknowledge: true indices.delete: index: my_index2 - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_timeseries_lifecycle" @@ -170,7 +160,6 @@ setup: --- "Test Undeletable Policy In Use": - do: - acknowlege: true ilm.put_lifecycle: policy: "my_timeseries_lifecycle" body: | @@ -196,7 +185,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_timeseries_lifecycle" - match: { my_timeseries_lifecycle.policy.phases.warm.minimum_age: "10s" } @@ -221,7 +209,6 @@ setup: index: my_timeseries_index - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_timeseries_lifecycle" diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/20_move_to_step.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/20_move_to_step.yml index f102a801c81..3c80b98d89f 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/20_move_to_step.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/20_move_to_step.yml @@ -4,7 +4,6 @@ setup: cluster.health: wait_for_status: yellow - do: - acknowlege: true ilm.put_lifecycle: policy: "my_moveable_timeseries_lifecycle" body: | @@ -28,7 +27,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_moveable_timeseries_lifecycle" @@ -47,17 +45,14 @@ setup: teardown: - do: - acknowledge: true indices.delete: index: my_index - do: - acknowledge: true indices.delete: index: my_index_no_policy - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_moveable_timeseries_lifecycle" @@ -70,7 +65,6 @@ teardown: "Test Basic Move To Step": - do: - acknowledge: true ilm.move_to_step: index: "my_index" body: @@ -84,7 +78,6 @@ teardown: name: "forcemerge" - do: - acknowledge: true ilm.explain_lifecycle: index: "my_index" - match: { indices.my_index.policy: "my_moveable_timeseries_lifecycle" } @@ -113,7 +106,6 @@ teardown: - do: - acknowledge: true ilm.explain_lifecycle: index: "my_index" - match: { indices.my_index.policy: "my_moveable_timeseries_lifecycle" } @@ -141,7 +133,6 @@ teardown: - match: { error.root_cause.0.reason: "step [{\"phase\":\"invalid\",\"action\":\"invalid\",\"name\":\"invalid\"}] for index [my_index] with policy [my_moveable_timeseries_lifecycle] does not exist" } - do: - acknowledge: true ilm.explain_lifecycle: index: "my_index" - match: { indices.my_index.policy: "my_moveable_timeseries_lifecycle" } diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/30_retry.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/30_retry.yml index 0ffcc74a70e..52aad1fc393 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/30_retry.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/30_retry.yml @@ -5,7 +5,6 @@ setup: wait_for_status: yellow - do: - acknowlege: true ilm.put_lifecycle: policy: "my_lifecycle" body: | @@ -29,7 +28,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_lifecycle" @@ -37,12 +35,10 @@ setup: teardown: - do: - acknowledge: true indices.delete: index: my_index - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_lifecycle" @@ -69,7 +65,6 @@ teardown: - match: { error.root_cause.0.reason: "cannot retry an action for an index [my_index] that has not encountered an error when running a Lifecycle Policy" } - do: - acknowledge: true ilm.explain_lifecycle: index: "my_index" - match: { indices.my_index.policy: "my_lifecycle" } diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/40_explain_lifecycle.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/40_explain_lifecycle.yml index 18248189917..6ac0a3fcf76 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/40_explain_lifecycle.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/40_explain_lifecycle.yml @@ -4,7 +4,6 @@ setup: cluster.health: wait_for_status: yellow - do: - acknowlege: true ilm.put_lifecycle: policy: "my_moveable_timeseries_lifecycle" body: | @@ -28,7 +27,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_moveable_timeseries_lifecycle" @@ -67,29 +65,23 @@ setup: teardown: - do: - acknowledge: true indices.delete: index: my_index - do: - acknowledge: true indices.delete: index: my_index2 - do: - acknowledge: true indices.delete: index: another_index - do: - acknowledge: true indices.delete: index: unmanaged_index - do: - acknowledge: true indices.delete: index: my_index_no_policy - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_moveable_timeseries_lifecycle" @@ -102,7 +94,6 @@ teardown: "Test Basic Lifecycle Explain": - do: - acknowledge: true ilm.explain_lifecycle: index: "my_index" @@ -125,7 +116,6 @@ teardown: "Test Wildcard Index Lifecycle Explain": - do: - acknowledge: true ilm.explain_lifecycle: index: "my_*" @@ -159,7 +149,6 @@ teardown: "Test All Indexes Lifecycle Explain": - do: - acknowledge: true ilm.explain_lifecycle: index: "*" @@ -209,7 +198,6 @@ teardown: "Test Unmanaged Index Lifecycle Explain": - do: - acknowledge: true ilm.explain_lifecycle: index: "unmanaged_index" @@ -230,7 +218,6 @@ teardown: "Test new phase still has phase_time": - do: - acknowlege: true ilm.put_lifecycle: policy: "mypolicy" body: | @@ -261,7 +248,6 @@ teardown: index.lifecycle.name: "mypolicy" - do: - acknowledge: true ilm.explain_lifecycle: index: "foo" diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_operation_mode.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_operation_mode.yml index 0a1055d086b..a3263a270ae 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_operation_mode.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_operation_mode.yml @@ -11,7 +11,6 @@ setup: - match: { operation_mode: "RUNNING" } - do: - acknowlege: true ilm.put_lifecycle: policy: "my_timeseries_lifecycle" body: | @@ -41,7 +40,6 @@ setup: - match: { operation_mode: "RUNNING" } - do: - acknowledge: true ilm.stop: {} - do: @@ -49,7 +47,6 @@ setup: - match: { operation_mode: /STOPP(ED|ING)/ } - do: - acknowledge: true ilm.start: {} - do: @@ -57,7 +54,6 @@ setup: - match: { operation_mode: "RUNNING" } - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_timeseries_lifecycle" diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_remove_policy_for_index.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_remove_policy_for_index.yml index 4950b38200c..14c4a3cd754 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_remove_policy_for_index.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ilm/60_remove_policy_for_index.yml @@ -4,7 +4,6 @@ setup: cluster.health: wait_for_status: yellow - do: - acknowlege: true ilm.put_lifecycle: policy: "my_moveable_timeseries_lifecycle" body: | @@ -28,12 +27,10 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_moveable_timeseries_lifecycle" - do: - acknowlege: true ilm.put_lifecycle: policy: "my_alternative_timeseries_lifecycle" body: | @@ -57,7 +54,6 @@ setup: } - do: - acknowledge: true ilm.get_lifecycle: policy: "my_alternative_timeseries_lifecycle" @@ -96,29 +92,23 @@ setup: teardown: - do: - acknowledge: true indices.delete: index: my_index - do: - acknowledge: true indices.delete: index: my_index2 - do: - acknowledge: true indices.delete: index: another_index - do: - acknowledge: true indices.delete: index: unmanaged_index - do: - acknowledge: true indices.delete: index: my_index_no_policy - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_moveable_timeseries_lifecycle" @@ -128,7 +118,6 @@ teardown: policy: "my_moveable_timeseries_lifecycle" - do: - acknowledge: true ilm.delete_lifecycle: policy: "my_alternative_timeseries_lifecycle" @@ -147,7 +136,6 @@ teardown: - match: { another_index.settings.index.lifecycle.name: my_moveable_timeseries_lifecycle } - do: - acknowledge: true ilm.remove_policy: index: "another_index" @@ -171,7 +159,6 @@ teardown: - match: { my_index2.settings.index.lifecycle.name: my_moveable_timeseries_lifecycle } - do: - acknowledge: true ilm.remove_policy: index: "my_*" @@ -195,7 +182,6 @@ teardown: - is_false: unmanaged_index.settings.index.lifecycle.name - do: - acknowledge: true ilm.remove_policy: index: "unmanaged_index"