Skip to content

Commit 0ce7e7a

Browse files
authored
Enable tests failing due to java-joda warnings (#42693)
Tests were failing in mixed cluster after more broad warnings were introduced in 6.x These tests were using `yyyy-MM-dd` pattern which is now warning about the change of `y` to `u`. However, using predefined pattern `strict_date` which uses the same format prevents the warning from being generate and allow smooth upgrade/work in mixed cluster. relates #42679
1 parent f6779de commit 0ce7e7a

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ setup:
284284
"date_histogram": {
285285
"field": "date",
286286
"interval": "1d",
287-
"format": "yyyy-MM-dd"
287+
"format": "strict_date"
288288
}
289289
}
290290
}
@@ -316,7 +316,7 @@ setup:
316316
"date_histogram": {
317317
"field": "date",
318318
"interval": "1d",
319-
"format": "yyyy-MM-dd"
319+
"format": "strict_date"
320320
}
321321
}
322322
}
@@ -347,7 +347,7 @@ setup:
347347
"date_histogram": {
348348
"field": "date",
349349
"calendar_interval": "1d",
350-
"format": "yyyy-MM-dd"
350+
"format": "strict_date"
351351
}
352352
}
353353
}
@@ -377,7 +377,7 @@ setup:
377377
"date_histogram": {
378378
"field": "date",
379379
"calendar_interval": "1d",
380-
"format": "yyyy-MM-dd"
380+
"format": "strict_date"
381381
}
382382
}
383383
}

rest-api-spec/src/main/resources/rest-api-spec/test/search/140_pre_filter_search_shards.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ setup:
99
properties:
1010
created_at:
1111
type: date
12-
format: "yyyy-MM-dd"
12+
format: "strict_date"
1313
- do:
1414
indices.create:
1515
index: index_2
@@ -20,7 +20,7 @@ setup:
2020
properties:
2121
created_at:
2222
type: date
23-
format: "yyyy-MM-dd"
23+
format: "strict_date"
2424
- do:
2525
indices.create:
2626
index: index_3
@@ -31,14 +31,11 @@ setup:
3131
properties:
3232
created_at:
3333
type: date
34-
format: "yyyy-MM-dd"
34+
format: "strict_date"
3535

3636

3737
---
3838
"pre_filter_shard_size with invalid parameter":
39-
- skip:
40-
version: "all"
41-
reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/42679"
4239
- do:
4340
catch: /preFilterShardSize must be >= 1/
4441
search:
@@ -48,9 +45,6 @@ setup:
4845

4946
---
5047
"pre_filter_shard_size with shards that have no hit":
51-
- skip:
52-
version: "all"
53-
reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/42679"
5448
- do:
5549
index:
5650
index: index_1

0 commit comments

Comments
 (0)