From c3ad4f8bd858e080fbe3aca6b94c61ce8ac69cdf Mon Sep 17 00:00:00 2001 From: albertteoh Date: Fri, 28 Aug 2020 22:47:04 +1000 Subject: [PATCH] Fix broken test in go 1.15 --- cmd/query/app/query_parser_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/query/app/query_parser_test.go b/cmd/query/app/query_parser_test.go index a75c835be9d8..8250bddb57fa 100644 --- a/cmd/query/app/query_parser_test.go +++ b/cmd/query/app/query_parser_test.go @@ -16,7 +16,9 @@ package app import ( + "fmt" "net/http" + "strings" "testing" "time" @@ -41,8 +43,8 @@ func TestParseTraceQuery(t *testing.T) { {"x?service=service&start=string", errParseInt, nil}, {"x?service=service&end=string", errParseInt, nil}, {"x?service=service&limit=string", errParseInt, nil}, - {"x?service=service&start=0&end=0&operation=operation&limit=200&minDuration=20", "cannot not parse minDuration: time: missing unit in duration 20", nil}, - {"x?service=service&start=0&end=0&operation=operation&limit=200&minDuration=20s&maxDuration=30", "cannot not parse maxDuration: time: missing unit in duration 30", nil}, + {"x?service=service&start=0&end=0&operation=operation&limit=200&minDuration=20", "cannot not parse minDuration: time: missing unit in duration", nil}, + {"x?service=service&start=0&end=0&operation=operation&limit=200&minDuration=20s&maxDuration=30", "cannot not parse maxDuration: time: missing unit in duration", nil}, {"x?service=service&start=0&end=0&operation=operation&limit=200&tag=k:v&tag=x:y&tag=k&log=k:v&log=k", `malformed 'tag' parameter, expecting key:value, received: k`, nil}, {"x?service=service&start=0&end=0&operation=operation&limit=200&minDuration=25s&maxDuration=1s", `'maxDuration' should be greater than 'minDuration'`, nil}, {"x?service=service&start=0&end=0&operation=operation&limit=200&tag=k:v&tag=x:y", noErr, @@ -161,7 +163,7 @@ func TestParseTraceQuery(t *testing.T) { } } } else { - assert.EqualError(t, err, test.errMsg) + assert.True(t, strings.HasPrefix(err.Error(), test.errMsg), fmt.Sprintf("Error \"%s\" should start with \"%s\"", err.Error(), test.errMsg)) } }) }