From f74e964519734d97dbcae3d9fe8d8bc975919d7a Mon Sep 17 00:00:00 2001 From: Yexiang Zhang Date: Wed, 7 Jun 2023 14:06:56 +0800 Subject: [PATCH] This is an automated cherry-pick of #184 Signed-off-by: ti-chi-bot --- component/conprof/scrape/manager_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/component/conprof/scrape/manager_test.go b/component/conprof/scrape/manager_test.go index 59d0c8c..919d01d 100644 --- a/component/conprof/scrape/manager_test.go +++ b/component/conprof/scrape/manager_test.go @@ -89,7 +89,11 @@ func TestManager(t *testing.T) { break } } +<<<<<<< HEAD // TODO(crazycs): remove this after support tiflash +======= + // TODO: remove this after support tiflash +>>>>>>> 0b36375 (conprof: disable profiling tiflash (#184)) require.True(t, list.Target.Component != topology.ComponentTiFlash) require.True(t, found, fmt.Sprintf("%#v", list)) for _, ts := range list.TsList { @@ -131,7 +135,11 @@ func TestManager(t *testing.T) { // test for GetCurrentScrapeComponents comp := manager.GetCurrentScrapeComponents() +<<<<<<< HEAD // // TODO(crazycs): update this after support tiflash +======= + // TODO: update this after support tiflash +>>>>>>> 0b36375 (conprof: disable profiling tiflash (#184)) require.Equal(t, len(comp), len(components)-1) // test for topology changed.