Skip to content

Commit 774adad

Browse files
authored
Use regexes to match monitoring tests with messages that change in v9 (#124080) (#124093)
The messages are changing in v9, so change to regexes that work for both old and new formats
1 parent dfc0573 commit 774adad

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/monitoring/bulk/10_basic.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
"Bulk indexing of monitoring data":
33
- skip:
4-
features: ["allowed_warnings"]
4+
features: ["allowed_warnings_regex"]
55

66
- do:
7-
allowed_warnings:
8-
- "[xpack.monitoring.collection.enabled] setting was deprecated in Elasticsearch and will be removed in a future release."
7+
allowed_warnings_regex:
8+
- "\\[xpack.monitoring.collection.enabled] setting was deprecated in Elasticsearch and will be removed in a future release.*"
99
cluster.put_settings:
1010
body:
1111
persistent:
@@ -172,11 +172,11 @@
172172
---
173173
"Bulk indexing of monitoring data on closed indices should throw an export exception":
174174
- skip:
175-
features: ["allowed_warnings"]
175+
features: ["allowed_warnings", "allowed_warnings_regex"]
176176

177177
- do:
178-
allowed_warnings:
179-
- "[xpack.monitoring.collection.enabled] setting was deprecated in Elasticsearch and will be removed in a future release."
178+
allowed_warnings_regex:
179+
- "\\[xpack.monitoring.collection.enabled] setting was deprecated in Elasticsearch and will be removed in a future release.*"
180180
cluster.put_settings:
181181
body:
182182
persistent:

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/monitoring/bulk/20_privileges.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ teardown:
7676
---
7777
"Monitoring Bulk API":
7878
- skip:
79-
features: ["catch_unauthorized", "allowed_warnings"]
79+
features: ["catch_unauthorized", "allowed_warnings_regex"]
8080

8181
- do:
82-
allowed_warnings:
83-
- "[xpack.monitoring.collection.enabled] setting was deprecated in Elasticsearch and will be removed in a future release."
82+
allowed_warnings_regex:
83+
- "\\[xpack.monitoring.collection.enabled] setting was deprecated in Elasticsearch and will be removed in a future release.*"
8484
cluster.put_settings:
8585
body:
8686
persistent:

0 commit comments

Comments
 (0)