IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Expressions: Field names from refId (#29755)

Browse Source 
so one can see which expression data came from when visualizing
This commit is contained in:
Kyle Brandt
2020-12-11 06:59:12 -05:00
committed by GitHub
parent a515c54404
commit 67372378ac
14 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/expr/mathexp/exp_nan_null_val_test.go
View File

@@ -144,7 +144,7 @@ func TestNaN(t *testing.T) {
e, err := New(tt.expr)
tt.newErrIs(t, err)
if e != nil {
res, err := e.Execute(tt.vars)
res, err := e.Execute("", tt.vars)
tt.execErrIs(t, err)
if diff := cmp.Diff(res, tt.results, options...); diff != "" {
assert.FailNow(t, tt.name, diff)
@@ -175,21 +175,21 @@ func TestNullValues(t *testing.T) {
expr: "! null()",
newErrIs: assert.NoError,
execErrIs: assert.NoError,
results: NewScalarResults(nil),
results: NewScalarResults("", nil),
},
{
name: "scalar: binary null() + null(): is null",
expr: "null() + null()",
newErrIs: assert.NoError,
execErrIs: assert.NoError,
results: NewScalarResults(nil),
results: NewScalarResults("", nil),
},
{
name: "scalar: binary 1 + null(): is null",
expr: "1 + null()",
newErrIs: assert.NoError,
execErrIs: assert.NoError,
results: NewScalarResults(nil),
results: NewScalarResults("", nil),
},
{
name: "series: unary with a null value in it has a null value in result",
@@ -406,7 +406,7 @@ func TestNullValues(t *testing.T) {
e, err := New(tt.expr)
tt.newErrIs(t, err)
if e != nil {
res, err := e.Execute(tt.vars)
res, err := e.Execute("", tt.vars)
tt.execErrIs(t, err)
if diff := cmp.Diff(tt.results, res, options...); diff != "" {
t.Errorf("Result mismatch (-want +got):\n%s", diff)