From 4284dd1f1b8ec701673d65e4d12db1df59851061 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Fri, 5 Jun 2020 19:51:25 +0200 Subject: [PATCH] promql: cleanup: use errors.As (#7351) This was TODO because circleci was not in go1.13 yet. Signed-off-by: Julien Pivotto --- promql/engine_test.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/promql/engine_test.go b/promql/engine_test.go index a202a0bf92..e0a83aa1d8 100644 --- a/promql/engine_test.go +++ b/promql/engine_test.go @@ -19,7 +19,6 @@ import ( "io/ioutil" "os" "sort" - "strings" "testing" "time" @@ -117,9 +116,7 @@ func TestQueryTimeout(t *testing.T) { testutil.NotOk(t, res.Err, "expected timeout error but got none") var e ErrQueryTimeout - // TODO: when circleci-windows moves to go 1.13: - // testutil.Assert(t, errors.As(res.Err, &e), "expected timeout error but got: %s", res.Err) - testutil.Assert(t, strings.HasPrefix(res.Err.Error(), e.Error()), "expected timeout error but got: %s", res.Err) + testutil.Assert(t, errors.As(res.Err, &e), "expected timeout error but got: %s", res.Err) } const errQueryCanceled = ErrQueryCanceled("test statement execution") @@ -499,9 +496,7 @@ func TestEngineShutdown(t *testing.T) { testutil.NotOk(t, res2.Err, "expected error on querying with canceled context but got none") var e ErrQueryCanceled - // TODO: when circleci-windows moves to go 1.13: - // testutil.Assert(t, errors.As(res2.Err, &e), "expected cancellation error but got: %s", res2.Err) - testutil.Assert(t, strings.HasPrefix(res2.Err.Error(), e.Error()), "expected cancellation error but got: %s", res2.Err) + testutil.Assert(t, errors.As(res2.Err, &e), "expected cancellation error but got: %s", res2.Err) } func TestEngineEvalStmtTimestamps(t *testing.T) {