From 975a400d2a82d6f3d0096c1a212ba8c43a857130 Mon Sep 17 00:00:00 2001 From: lhy1024 Date: Mon, 6 Mar 2023 22:04:35 +0800 Subject: [PATCH] refactor Signed-off-by: lhy1024 --- pkg/utils/etcdutil/etcdutil_test.go | 6 ++++-- pkg/utils/etcdutil/testutil.go | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/utils/etcdutil/etcdutil_test.go b/pkg/utils/etcdutil/etcdutil_test.go index 4cc680bb6be..06ac61e264e 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" @@ -248,10 +247,13 @@ func TestEtcdClientSync(t *testing.T) { 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)")) 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)")) err = checkEtcdWithHangLeader(t) re.Error(err) @@ -294,7 +296,7 @@ func checkEtcdWithHangLeader(t *testing.T) error { func checkAddEtcdMember(t *testing.T, cfg1 *embed.Config, client *clientv3.Client) *embed.Etcd { re := require.New(t) cfg2 := NewTestSingleConfig(t) - cfg2.Name = "test_etcd_" + strconv.FormatInt(time.Now().UnixNano()%1000, 10) + cfg2.Name = genRandName() cfg2.InitialCluster = cfg1.InitialCluster + fmt.Sprintf(",%s=%s", cfg2.Name, &cfg2.LPUrls[0]) cfg2.ClusterState = embed.ClusterStateFlagExisting peerURL := cfg2.LPUrls[0].String() diff --git a/pkg/utils/etcdutil/testutil.go b/pkg/utils/etcdutil/testutil.go index d584c6f38a4..971e93e1ed6 100644 --- a/pkg/utils/etcdutil/testutil.go +++ b/pkg/utils/etcdutil/testutil.go @@ -28,7 +28,7 @@ import ( // NewTestSingleConfig is used to create a etcd config for the unit test purpose. func NewTestSingleConfig(t *testing.T) *embed.Config { cfg := embed.NewConfig() - cfg.Name = "test_etcd_" + strconv.FormatInt(time.Now().UnixNano()%1000, 10) + cfg.Name = genRandName() cfg.Dir = t.TempDir() cfg.WalDir = "" cfg.Logger = "zap" @@ -46,3 +46,7 @@ func NewTestSingleConfig(t *testing.T) *embed.Config { cfg.ClusterState = embed.ClusterStateFlagNew return cfg } + +func genRandName() string { + return "test_etcd_" + strconv.FormatInt(time.Now().UnixNano()%10000, 10) +}