Elasticsearch: fix flaky test (#34517)

pull/34595/head
Giordano Ricci 5 years ago committed by GitHub
parent d95cc4a08f
commit e2e78f14d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      pkg/tsdb/elasticsearch/time_series_query_test.go

@ -937,9 +937,6 @@ 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")
for key := range scriptableAggType {
t.Run("Inline Script", func(t *testing.T) {
_, err := executeTsdbQuery(c, `{ _, err := executeTsdbQuery(c, `{
"timeField": "@timestamp", "timeField": "@timestamp",
"bucketAggs": [ "bucketAggs": [
@ -948,14 +945,14 @@ func TestSettingsCasting(t *testing.T) {
"metrics": [ "metrics": [
{ {
"id": "1", "id": "1",
"type": "`+key+`", "type": "avg",
"settings": { "settings": {
"script": "my_script" "script": "my_script"
} }
}, },
{ {
"id": "3", "id": "3",
"type": "`+key+`", "type": "avg",
"settings": { "settings": {
"script": { "script": {
"inline": "my_script" "inline": "my_script"
@ -974,15 +971,9 @@ func TestSettingsCasting(t *testing.T) {
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")
for key := range scriptableAggType {
fmt.Println(key)
t.Run("Inline Script", func(t *testing.T) {
_, err := executeTsdbQuery(c, `{ _, err := executeTsdbQuery(c, `{
"timeField": "@timestamp", "timeField": "@timestamp",
"bucketAggs": [ "bucketAggs": [
@ -991,14 +982,14 @@ func TestSettingsCasting(t *testing.T) {
"metrics": [ "metrics": [
{ {
"id": "1", "id": "1",
"type": "`+key+`", "type": "avg",
"settings": { "settings": {
"script": "my_script" "script": "my_script"
} }
}, },
{ {
"id": "3", "id": "3",
"type": "`+key+`", "type": "avg",
"settings": { "settings": {
"script": { "script": {
"inline": "my_script" "inline": "my_script"
@ -1017,8 +1008,6 @@ func TestSettingsCasting(t *testing.T) {
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"])
}) })
}
})
}) })
} }

Loading…
Cancel
Save