diff --git a/cluster/cluster_impl/failback_cluster_test.go b/cluster/cluster_impl/failback_cluster_test.go index 0edb81d4285fa68ceefd96100b541ba334f95bda..d36e16e2693f0926f8c8e39b6cd328b688ffa4b2 100644 --- a/cluster/cluster_impl/failback_cluster_test.go +++ b/cluster/cluster_impl/failback_cluster_test.go @@ -72,6 +72,8 @@ func TestFailbackSuceess(t *testing.T) { invoker.EXPECT().GetUrl().Return(failbackUrl).AnyTimes() + invoker.EXPECT().IsAvailable().Return(true) + mockResult := &protocol.RPCResult{Rest: rest{tried: 0, success: true}} invoker.EXPECT().Invoke(gomock.Any()).Return(mockResult) @@ -88,6 +90,7 @@ func TestFailbackRetryOneSuccess(t *testing.T) { clusterInvoker := registerFailback(invoker).(*failbackClusterInvoker) invoker.EXPECT().GetUrl().Return(failbackUrl).AnyTimes() + invoker.EXPECT().IsAvailable().Return(true) // failed at first mockFailedResult := &protocol.RPCResult{Err: perrors.New("error")} @@ -98,6 +101,7 @@ func TestFailbackRetryOneSuccess(t *testing.T) { wg.Add(1) now := time.Now() mockSuccResult := &protocol.RPCResult{Rest: rest{tried: 0, success: true}} + invoker.EXPECT().IsAvailable().Return(true) invoker.EXPECT().Invoke(gomock.Any()).DoAndReturn(func(protocol.Invocation) protocol.Result { delta := time.Since(now).Nanoseconds() / int64(time.Second) assert.True(t, delta >= 5) @@ -131,6 +135,7 @@ func TestFailbackRetryFailed(t *testing.T) { clusterInvoker := registerFailback(invoker).(*failbackClusterInvoker) invoker.EXPECT().GetUrl().Return(failbackUrl).AnyTimes() + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() mockFailedResult := &protocol.RPCResult{Err: perrors.New("error")} invoker.EXPECT().Invoke(gomock.Any()).Return(mockFailedResult) @@ -177,6 +182,7 @@ func TestFailbackRetryFailed10Times(t *testing.T) { clusterInvoker := registerFailback(invoker).(*failbackClusterInvoker) clusterInvoker.maxRetries = 10 + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() invoker.EXPECT().GetUrl().Return(failbackUrl).AnyTimes() // 10 task should failed firstly. @@ -220,6 +226,7 @@ func TestFailbackOutOfLimit(t *testing.T) { clusterInvoker.failbackTasks = 1 invoker.EXPECT().GetUrl().Return(failbackUrl).AnyTimes() + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() mockFailedResult := &protocol.RPCResult{Err: perrors.New("error")} invoker.EXPECT().Invoke(gomock.Any()).Return(mockFailedResult).Times(11) diff --git a/cluster/cluster_impl/failfast_cluster_test.go b/cluster/cluster_impl/failfast_cluster_test.go index 77e8e9c5da73bfc8bcf08dbd90351bfd23d7e651..9ac06b8d4a7bec39b08a308cc52fe41e9524b1c0 100644 --- a/cluster/cluster_impl/failfast_cluster_test.go +++ b/cluster/cluster_impl/failfast_cluster_test.go @@ -53,6 +53,7 @@ func registerFailfast(invoker *mock.MockInvoker) protocol.Invoker { invokers := []protocol.Invoker{} invokers = append(invokers, invoker) + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() invoker.EXPECT().GetUrl().Return(failfastUrl) staticDir := directory.NewStaticDirectory(invokers) @@ -67,6 +68,7 @@ func TestFailfastInvokeSuccess(t *testing.T) { invoker := mock.NewMockInvoker(ctrl) clusterInvoker := registerFailfast(invoker) + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() invoker.EXPECT().GetUrl().Return(failfastUrl).AnyTimes() mockResult := &protocol.RPCResult{Rest: rest{tried: 0, success: true}} @@ -87,6 +89,7 @@ func TestFailfastInvokeFail(t *testing.T) { invoker := mock.NewMockInvoker(ctrl) clusterInvoker := registerFailfast(invoker) + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() invoker.EXPECT().GetUrl().Return(failfastUrl).AnyTimes() mockResult := &protocol.RPCResult{Err: perrors.New("error")} diff --git a/cluster/cluster_impl/failsafe_cluster_test.go b/cluster/cluster_impl/failsafe_cluster_test.go index d9a716e1ae65a84b605b4b7af1872b3a85dc9369..5e208bdddee335cc5dff6beed5ab34243831dbb5 100644 --- a/cluster/cluster_impl/failsafe_cluster_test.go +++ b/cluster/cluster_impl/failsafe_cluster_test.go @@ -52,6 +52,7 @@ func registerFailsafe(invoker *mock.MockInvoker) protocol.Invoker { invokers := []protocol.Invoker{} invokers = append(invokers, invoker) + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() invoker.EXPECT().GetUrl().Return(failbackUrl) @@ -67,6 +68,8 @@ func TestFailSafeInvokeSuccess(t *testing.T) { invoker := mock.NewMockInvoker(ctrl) clusterInvoker := registerFailsafe(invoker) + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() + invoker.EXPECT().GetUrl().Return(failsafeUrl).AnyTimes() mockResult := &protocol.RPCResult{Rest: rest{tried: 0, success: true}} @@ -85,6 +88,7 @@ func TestFailSafeInvokeFail(t *testing.T) { invoker := mock.NewMockInvoker(ctrl) clusterInvoker := registerFailsafe(invoker) + invoker.EXPECT().IsAvailable().Return(true).AnyTimes() invoker.EXPECT().GetUrl().Return(failsafeUrl).AnyTimes()