From 9cffc674e79ab715c1854ca143ff1c03ccee4e35 Mon Sep 17 00:00:00 2001
From: FogDong <dongtianxin.tx@alibaba-inc.com>
Date: Tue, 25 Apr 2023 14:10:14 +0800
Subject: [PATCH] fix email test casses

Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
---
 pkg/providers/legacy/email/email.go      |  5 +++--
 pkg/providers/legacy/email/email_test.go | 11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/providers/legacy/email/email.go b/pkg/providers/legacy/email/email.go
index eddac85..475ccf3 100644
--- a/pkg/providers/legacy/email/email.go
+++ b/pkg/providers/legacy/email/email.go
@@ -64,7 +64,7 @@ type MailParams = providertypes.LegacyParams[MailVars]
 var emailRoutine sync.Map
 
 // Send sends email
-func Send(ctx context.Context, params *MailParams) (*any, error) {
+func Send(ctx context.Context, params *MailParams) (res *any, err error) {
 	pCtx := params.ProcessContext
 	act := params.Action
 	id := fmt.Sprint(pCtx.GetData(model.ContextStepSessionID))
@@ -97,8 +97,9 @@ func Send(ctx context.Context, params *MailParams) (*any, error) {
 	go func() {
 		if routine, ok := emailRoutine.Load(id); ok && routine == "initializing" {
 			emailRoutine.Store(id, "sending")
-			if err := dial.DialAndSend(m); err != nil {
+			if err = dial.DialAndSend(m); err != nil {
 				emailRoutine.Store(id, err.Error())
+				fmt.Println("=========", err.Error())
 				return
 			}
 			emailRoutine.Store(id, "success")
diff --git a/pkg/providers/legacy/email/email_test.go b/pkg/providers/legacy/email/email_test.go
index 03fb866..4b2fb0e 100644
--- a/pkg/providers/legacy/email/email_test.go
+++ b/pkg/providers/legacy/email/email_test.go
@@ -18,7 +18,6 @@ package email
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"reflect"
 	"testing"
@@ -30,6 +29,7 @@ import (
 
 	"github.com/kubevela/workflow/pkg/cue/model"
 	"github.com/kubevela/workflow/pkg/cue/process"
+	"github.com/kubevela/workflow/pkg/errors"
 	"github.com/kubevela/workflow/pkg/mock"
 	providertypes "github.com/kubevela/workflow/pkg/providers/types"
 )
@@ -94,7 +94,7 @@ func TestSendEmail(t *testing.T) {
 			if tc.errMsg != "" {
 				patch.Reset()
 				patch = ApplyMethod(reflect.TypeOf(dial), "DialAndSend", func(_ *gomail.Dialer, _ ...*gomail.Message) error {
-					return errors.New(tc.errMsg)
+					return fmt.Errorf(tc.errMsg)
 				})
 				defer patch.Reset()
 			}
@@ -109,7 +109,8 @@ func TestSendEmail(t *testing.T) {
 				r.Equal(tc.expectedErr.Error(), err.Error())
 				return
 			}
-			r.NoError(err)
+			_, ok := err.(errors.GenericActionError)
+			r.Equal(ok, true)
 			r.Equal(act.Phase, "Wait")
 
 			// mock reconcile
@@ -122,10 +123,8 @@ func TestSendEmail(t *testing.T) {
 				},
 			})
 			if tc.errMsg != "" {
-				r.Equal(fmt.Errorf("failed to send email: %s", tc.errMsg), err)
-				return
+				r.Contains(err.Error(), tc.errMsg)
 			}
-			r.NoError(err)
 		})
 	}
 }