From b56cc8e45954d89ec4240a582a515350156dcd0a Mon Sep 17 00:00:00 2001 From: songmeizi Date: Fri, 11 Dec 2020 21:57:04 +0800 Subject: [PATCH] optimize test case of TestRpcGenerate (#279) Co-authored-by: anqiansong --- tools/goctl/rpc/generator/gen_test.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/goctl/rpc/generator/gen_test.go b/tools/goctl/rpc/generator/gen_test.go index c5ac5202..45af8cdd 100644 --- a/tools/goctl/rpc/generator/gen_test.go +++ b/tools/goctl/rpc/generator/gen_test.go @@ -4,6 +4,7 @@ import ( "go/build" "os" "path/filepath" + "strings" "testing" "github.com/stretchr/testify/assert" @@ -44,7 +45,9 @@ func TestRpcGenerate(t *testing.T) { assert.Nil(t, err) _, err = execx.Run("go test "+projectName, projectDir) if err != nil { - assert.Contains(t, err.Error(), "not in GOROOT") + assert.True(t, func() bool { + return strings.Contains(err.Error(), "not in GOROOT") || strings.Contains(err.Error(), "cannot find package") + }()) } // case go mod @@ -61,7 +64,9 @@ func TestRpcGenerate(t *testing.T) { assert.Nil(t, err) _, err = execx.Run("go test "+projectName, projectDir) if err != nil { - assert.Contains(t, err.Error(), "not in GOROOT") + assert.True(t, func() bool { + return strings.Contains(err.Error(), "not in GOROOT") || strings.Contains(err.Error(), "cannot find package") + }()) } // case not in go mod and go path @@ -69,7 +74,9 @@ func TestRpcGenerate(t *testing.T) { assert.Nil(t, err) _, err = execx.Run("go test "+projectName, projectDir) if err != nil { - assert.Contains(t, err.Error(), "not in GOROOT") + assert.True(t, func() bool { + return strings.Contains(err.Error(), "not in GOROOT") || strings.Contains(err.Error(), "cannot find package") + }()) } // invalid directory