mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-30 15:12:27 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #952 from prometheus/promql-test

Browse source 
promql: Test errors aren't always ParseErr
This commit is contained in:
Brian Brazil 2015-08-03 11:01:14 +01:00
parent ba24948ec7 a0f0b82348
commit 2983a9ad76
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
promql/test.go
View file

@ -114,8 +114,9 @@ func (t *Test) parseLoad(lines []string, i int) (int, *loadCmd, error) {
} }
metric, vals, err := parseSeriesDesc(defLine) metric, vals, err := parseSeriesDesc(defLine)
if err != nil { if err != nil {
perr := err.(*ParseErr) if perr, ok := err.(*ParseErr); ok {
perr.Line = i + 1 perr.Line = i + 1
}
return i, nil, err return i, nil, err
} }
cmd.set(metric, vals...) cmd.set(metric, vals...)
@ -135,10 +136,11 @@ func (t *Test) parseEval(lines []string, i int) (int, *evalCmd, error) {
) )
expr, err := ParseExpr(qry) expr, err := ParseExpr(qry)
if err != nil { if err != nil {
perr := err.(*ParseErr) if perr, ok := err.(*ParseErr); ok {
perr.Line = i + 1 perr.Line = i + 1
perr.Pos += strings.Index(lines[i], qry) perr.Pos += strings.Index(lines[i], qry)
return i, nil, perr }
return i, nil, err
} }
offset, err := strutil.StringToDuration(at) offset, err := strutil.StringToDuration(at)
@ -168,8 +170,9 @@ func (t *Test) parseEval(lines []string, i int) (int, *evalCmd, error) {
} }
metric, vals, err := parseSeriesDesc(defLine) metric, vals, err := parseSeriesDesc(defLine)
if err != nil { if err != nil {
perr := err.(*ParseErr) if perr, ok := err.(*ParseErr); ok {
perr.Line = i + 1 perr.Line = i + 1
}
return i, nil, err return i, nil, err
} }