public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Elasticsearch: fix flaky test (#34517)

Browse Source
This commit is contained in:
Giordano Ricci
2021-05-20 16:13:48 +01:00
committed by GitHub
parent d95cc4a08f
commit e2e78f14d2
1 changed files with 58 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/elasticsearch/time_series_query_test.go
+58 -69
View File
@@ -937,87 +937,76 @@ func TestSettingsCasting(t *testing.T) {
t.Run("Inline Script", func(t *testing.T) { t.Run("Inline Script", func(t *testing.T) {
t.Run("Correctly handles scripts for ES < 5.6", func(t *testing.T) { t.Run("Correctly handles scripts for ES < 5.6", func(t *testing.T) {
c := newFakeClient("5.0.0") c := newFakeClient("5.0.0")
_, err := executeTsdbQuery(c, `{
for key := range scriptableAggType { "timeField": "@timestamp",
t.Run("Inline Script", func(t *testing.T) { "bucketAggs": [
_, err := executeTsdbQuery(c, `{ { "type": "date_histogram", "field": "@timestamp", "id": "2" }
"timeField": "@timestamp", ],
"bucketAggs": [ "metrics": [
{ "type": "date_histogram", "field": "@timestamp", "id": "2" } {
], "id": "1",
"metrics": [ "type": "avg",
{ "settings": {
"id": "1", "script": "my_script"
"type": "`+key+`", }
"settings": { },
"script": "my_script" {
} "id": "3",
}, "type": "avg",
{ "settings": {
"id": "3", "script": {
"type": "`+key+`", "inline": "my_script"
"settings": {
"script": {
"inline": "my_script"
}
}
} }
] }
}`, from, to, 15*time.Second) }
]
}`, from, to, 15*time.Second)
assert.Nil(t, err) assert.Nil(t, err)
sr := c.multisearchRequests[0].Requests[0] sr := c.multisearchRequests[0].Requests[0]
newFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[0].Aggregation.Aggregation.(*es.MetricAggregation).Settings newFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[0].Aggregation.Aggregation.(*es.MetricAggregation).Settings
oldFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[1].Aggregation.Aggregation.(*es.MetricAggregation).Settings oldFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[1].Aggregation.Aggregation.(*es.MetricAggregation).Settings
assert.Equal(t, map[string]interface{}{"inline": "my_script"}, newFormatAggSettings["script"]) assert.Equal(t, map[string]interface{}{"inline": "my_script"}, newFormatAggSettings["script"])
assert.Equal(t, map[string]interface{}{"inline": "my_script"}, oldFormatAggSettings["script"]) assert.Equal(t, map[string]interface{}{"inline": "my_script"}, oldFormatAggSettings["script"])
})
}
}) })
t.Run("Correctly handles scripts for ES >= 5.6", func(t *testing.T) { t.Run("Correctly handles scripts for ES >= 5.6", func(t *testing.T) {
c := newFakeClient("5.6.0") c := newFakeClient("5.6.0")
_, err := executeTsdbQuery(c, `{
for key := range scriptableAggType { "timeField": "@timestamp",
fmt.Println(key) "bucketAggs": [
t.Run("Inline Script", func(t *testing.T) { { "type": "date_histogram", "field": "@timestamp", "id": "2" }
_, err := executeTsdbQuery(c, `{ ],
"timeField": "@timestamp", "metrics": [
"bucketAggs": [ {
{ "type": "date_histogram", "field": "@timestamp", "id": "2" } "id": "1",
], "type": "avg",
"metrics": [ "settings": {
{ "script": "my_script"
"id": "1", }
"type": "`+key+`", },
"settings": { {
"script": "my_script" "id": "3",
} "type": "avg",
}, "settings": {
{ "script": {
"id": "3", "inline": "my_script"
"type": "`+key+`",
"settings": {
"script": {
"inline": "my_script"
}
}
} }
] }
}`, from, to, 15*time.Second) }
]
}`, from, to, 15*time.Second)
assert.Nil(t, err) assert.Nil(t, err)
sr := c.multisearchRequests[0].Requests[0] sr := c.multisearchRequests[0].Requests[0]
newFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[0].Aggregation.Aggregation.(*es.MetricAggregation).Settings newFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[0].Aggregation.Aggregation.(*es.MetricAggregation).Settings
oldFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[1].Aggregation.Aggregation.(*es.MetricAggregation).Settings oldFormatAggSettings := sr.Aggs[0].Aggregation.Aggs[1].Aggregation.Aggregation.(*es.MetricAggregation).Settings
assert.Equal(t, "my_script", newFormatAggSettings["script"]) assert.Equal(t, "my_script", newFormatAggSettings["script"])
assert.Equal(t, "my_script", oldFormatAggSettings["script"]) assert.Equal(t, "my_script", oldFormatAggSettings["script"])
})
}
}) })
}) })
} }