From efd1fa8b8aa8a79643ee9bb4908e63d6b91b81dd Mon Sep 17 00:00:00 2001 From: congqixia Date: Thu, 13 Jun 2024 10:03:57 +0800 Subject: [PATCH] fix: [2.4] Prevent restart timetick sender creating ut datanode (#33790) (#33801) Cherry-pick from master pr: #33790 See also #33789 Signed-off-by: Congqi Xia --- internal/datanode/event_manager_test.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/internal/datanode/event_manager_test.go b/internal/datanode/event_manager_test.go index 41005cde3e..1854c8e8c8 100644 --- a/internal/datanode/event_manager_test.go +++ b/internal/datanode/event_manager_test.go @@ -58,14 +58,6 @@ func TestWatchChannel(t *testing.T) { defer etcdCli.Close() node.SetEtcdClient(etcdCli) err = node.Init() - assert.NoError(t, err) - err = node.Start() - assert.NoError(t, err) - defer node.Stop() - err = node.Register() - assert.NoError(t, err) - - defer cancel() broker := broker.NewMockBroker(t) broker.EXPECT().ReportTimeTick(mock.Anything, mock.Anything).Return(nil).Maybe() @@ -76,8 +68,14 @@ func TestWatchChannel(t *testing.T) { node.broker = broker - node.timeTickSender.Stop() - node.timeTickSender = newTimeTickSender(node.broker, 0) + assert.NoError(t, err) + err = node.Start() + assert.NoError(t, err) + defer node.Stop() + err = node.Register() + assert.NoError(t, err) + + defer cancel() t.Run("test watch channel", func(t *testing.T) { kv := etcdkv.NewEtcdKV(etcdCli, Params.EtcdCfg.MetaRootPath.GetValue())