From ddff1480a7d1ff4b8d49702e0beeb5f71e4cd6ac Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 25 Sep 2019 09:26:29 +0200 Subject: [PATCH] cmd/promtool: improve output for PromQL tests (#6052) Signed-off-by: Simon Pasquier --- cmd/promtool/unittest.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/promtool/unittest.go b/cmd/promtool/unittest.go index cef51960a..26370f41b 100644 --- a/cmd/promtool/unittest.go +++ b/cmd/promtool/unittest.go @@ -321,7 +321,7 @@ Outer: got, err := query(suite.Context(), testCase.Expr, mint.Add(testCase.EvalTime), suite.QueryEngine(), suite.Queryable()) if err != nil { - errs = append(errs, errors.Errorf(" expr:'%s', time:%s, err:%s", testCase.Expr, + errs = append(errs, errors.Errorf(" expr: %q, time: %s, err: %s", testCase.Expr, testCase.EvalTime.String(), err.Error())) continue } @@ -338,7 +338,8 @@ Outer: for _, s := range testCase.ExpSamples { lb, err := promql.ParseMetric(s.Labels) if err != nil { - errs = append(errs, errors.Errorf(" expr:'%s', time:%s, err:%s", testCase.Expr, + err = errors.Wrapf(err, "labels %q", s.Labels) + errs = append(errs, errors.Errorf(" expr: %q, time: %s, err: %s", testCase.Expr, testCase.EvalTime.String(), err.Error())) continue Outer } @@ -355,7 +356,7 @@ Outer: return labels.Compare(gotSamples[i].Labels, gotSamples[j].Labels) <= 0 }) if !reflect.DeepEqual(expSamples, gotSamples) { - errs = append(errs, errors.Errorf(" expr:'%s', time:%s, \n exp:%#v, \n got:%#v", testCase.Expr, + errs = append(errs, errors.Errorf(" expr: %q, time: %s,\n exp:%#v\n got:%#v", testCase.Expr, testCase.EvalTime.String(), parsedSamplesString(expSamples), parsedSamplesString(gotSamples))) } } @@ -510,7 +511,7 @@ func parsedSamplesString(pss []parsedSample) string { return "nil" } s := pss[0].String() - for _, ps := range pss[0:] { + for _, ps := range pss[1:] { s += ", " + ps.String() } return s