From 0db9312f04cbd5db85ae7767a9d28cef916f6b1a Mon Sep 17 00:00:00 2001 From: lhy1024 Date: Mon, 6 Mar 2023 21:35:53 +0800 Subject: [PATCH] fix ci Signed-off-by: lhy1024 --- pkg/utils/etcdutil/etcdutil_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/utils/etcdutil/etcdutil_test.go b/pkg/utils/etcdutil/etcdutil_test.go index c80619d4e990..049c4700c37a 100644 --- a/pkg/utils/etcdutil/etcdutil_test.go +++ b/pkg/utils/etcdutil/etcdutil_test.go @@ -20,7 +20,6 @@ import ( "fmt" "io" "net" - "strconv" "strings" "sync/atomic" "testing" @@ -211,6 +210,7 @@ func TestInitClusterID(t *testing.T) { func TestEtcdClientSync(t *testing.T) { re := require.New(t) re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/utils/etcdutil/autoSyncInterval", "return(true)")) + defer require.NoError(t, failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/autoSyncInterval")) // Start a etcd server. cfg1 := NewTestSingleConfig(t) @@ -241,21 +241,21 @@ func TestEtcdClientSync(t *testing.T) { re.NoError(err) re.Len(listResp3.Members, 1) re.Equal(uint64(etcd2.Server.ID()), listResp3.Members[0].ID) - - require.NoError(t, failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/autoSyncInterval")) } func TestEtcdWithHangLeaderEnableCheck(t *testing.T) { re := require.New(t) var err error + // Test with enable check. re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/utils/etcdutil/autoSyncInterval", "return(true)")) + defer require.NoError(t, failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/autoSyncInterval")) err = checkEtcdWithHangLeader(t) re.NoError(err) - require.NoError(t, failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/autoSyncInterval")) + // Test with disable check. re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/utils/etcdutil/closeKeepAliveCheck", "return(true)")) + defer require.NoError(t, failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/closeKeepAliveCheck")) err = checkEtcdWithHangLeader(t) re.Error(err) - require.NoError(t, failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/closeKeepAliveCheck")) } func checkEtcdWithHangLeader(t *testing.T) error {