RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 00:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

forbid unexpected (runtime) errors in parse tests

Browse Source
This commit is contained in:
Fabian Reinartz 2015-08-03 12:53:31 +02:00
parent c20e25f718
commit adf109795c
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
promql/parse.go
View File

@ -321,6 +321,8 @@ func (p *parser) expectOneOf(exp1, exp2 itemType, context string) item {
return token
}
var errUnexpected = fmt.Errorf("unexpected error")
// recover is the handler that turns panics into returns from the top level of Parse.
func (p *parser) recover(errp *error) {
e := recover()
@ -331,7 +333,7 @@ func (p *parser) recover(errp *error) {
buf = buf[:runtime.Stack(buf, false)]
log.Errorf("parser panic: %v\n%s", e, buf)
*errp = fmt.Errorf("unexpected error")
*errp = errUnexpected
} else {
*errp = e.(error)
}

35
promql/parse_test.go
View File

@ -973,6 +973,12 @@ func TestParseExpressions(t *testing.T) {
parser := newParser(test.input)
expr, err := parser.parseExpr()
// Unexpected errors are always caused by a bug.
if err == errUnexpected {
t.Fatalf("unexpected error occurred")
}
if !test.fail && err != nil {
t.Errorf("error in input '%s'", test.input)
t.Fatalf("could not parse: %s", err)
@ -1219,6 +1225,19 @@ var testStatement = []struct {
`,
fail: true,
},
// Fuzzing regression tests.
{
input: `I=-/`,
fail: true,
},
{
input: `I=3E8/-=`,
fail: true,
},
{
input: `M=-=-0-0`,
fail: true,
},
}
func TestParseStatements(t *testing.T) {
@ -1226,6 +1245,12 @@ func TestParseStatements(t *testing.T) {
parser := newParser(test.input)
stmts, err := parser.parseStmts()
// Unexpected errors are always caused by a bug.
if err == errUnexpected {
t.Fatalf("unexpected error occurred")
}
if !test.fail && err != nil {
t.Errorf("error in input: \n\n%s\n", test.input)
t.Fatalf("could not parse: %s", err)
@ -1353,6 +1378,12 @@ func TestParseSeries(t *testing.T) {
parser.lex.seriesDesc = true
metric, vals, err := parser.parseSeriesDesc()
// Unexpected errors are always caused by a bug.
if err == errUnexpected {
t.Fatalf("unexpected error occurred")
}
if !test.fail && err != nil {
t.Errorf("error in input: \n\n%s\n", test.input)
t.Fatalf("could not parse: %s", err)
@ -1385,8 +1416,8 @@ func TestRecoverRuntime(t *testing.T) {
var a []int
a[123] = 1
if err.Error() != "unexpected error" {
t.Fatalf("wrong error message: %q, expected %q", err, "unexpected error")
if err != errUnexpected {
t.Fatalf("wrong error message: %q, expected %q", err, errUnexpected)
}
}