Fix tests

Author: yuandrew

internal/internal_schedule_client_test.go

@@ -250,7 +250,11 @@ func (s *scheduleClientTestSuite) TestCreateScheduleWorkflowMemoDataConverter()
 			Do(func(_ interface{}, req *workflowservice.CreateScheduleRequest, _ ...interface{}) {
 				startWorkflow := req.Schedule.Action.GetStartWorkflow()
 				encoding := string(startWorkflow.Memo.Fields["testMemo"].Metadata[converter.MetadataEncoding])
-				s.Equal("binary/gob", encoding)
+				if memoUserDCEncode {
+					s.Equal("binary/gob", encoding)
+				} else {
+					s.Equal("json/plain", encoding)
+				}
 			})
 
 		_, err := s.client.ScheduleClient().Create(context.Background(), options)
@@ -302,7 +306,11 @@ func (s *scheduleClientTestSuite) TestCreateScheduleWorkflowMemoUserAndDefaultCo
 
 		_, err := s.client.ScheduleClient().Create(context.Background(), options)
 		s.Error(err)
-		s.ErrorContains(err, "failingMemoDataConverter memo encoding failed")
+		if memoUserDCEncode {
+			s.ErrorContains(err, "failingMemoDataConverter memo encoding failed")
+		} else {
+			s.ErrorContains(err, "unsupported type: chan int")
+		}
 	}
 
 	s.T().Run("old behavior", func(t *testing.T) {

internal/internal_workflow_testsuite.go

@@ -2857,9 +2857,6 @@ func (env *testWorkflowEnvironmentImpl) UpsertTypedSearchAttributes(attributes S
 
 func (env *testWorkflowEnvironmentImpl) UpsertMemo(memoMap map[string]interface{}) error {
 	memo, err := validateAndSerializeMemo(memoMap, env.dataConverter, env)
-	if err != nil {
-		return err
-	}
 
 	env.workflowInfo.Memo = mergeMemo(env.workflowInfo.Memo, memo)
 

internal/internal_workflow_testsuite_test.go

@@ -1877,7 +1877,8 @@ func (s *WorkflowTestSuiteUnitTest) Test_MockUpsertMemo() {
 		s.NotNil(wfInfo.Memo)
 		valBytes := wfInfo.Memo.Fields["CustomIntField"]
 		var result int
-		_ = converter.GetDefaultDataConverter().FromPayload(valBytes, &result)
+		err = converter.GetDefaultDataConverter().FromPayload(valBytes, &result)
+		s.NoError(err)
 		s.Equal(1, result)
 
 		return nil