Resolve the conflicts

Signed-off-by: JmPotato <[email protected]>
ti-chi-bot · Jun 25, 2024 · 32743de · 32743de
1 parent 4946557
commit 32743de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 79 deletions.
diff --git a/pkg/schedule/config/store_config_test.go b/pkg/schedule/config/store_config_test.go
diff --git a/pkg/typeutil/size_test.go b/pkg/typeutil/size_test.go
@@ -40,12 +40,9 @@ func TestSizeJSON(t *testing.T) {
 }
 
 func TestParseMbFromText(t *testing.T) {
-<<<<<<< HEAD:pkg/typeutil/size_test.go
-	t.Parallel()
-=======
 	const defaultValue = 2
 
->>>>>>> 6fbe73796 (config: fix the panic caused by zero RegionSplitSizeMB (#8324)):pkg/utils/typeutil/size_test.go
+	t.Parallel()
 	re := require.New(t)
 	testCases := []struct {
 		body []string

diff --git a/server/config/store_config_test.go b/server/config/store_config_test.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/docker/go-units"
 	"github.com/stretchr/testify/require"
+	"github.com/tikv/pd/pkg/typeutil"
 )
 
 func TestTiKVConfig(t *testing.T) {
@@ -158,4 +159,9 @@ func TestMergeCheck(t *testing.T) {
 			re.Error(config.CheckRegionKeys(v.keys, v.mergeKeys))
 		}
 	}
+	// Test CheckRegionSize when the region split size is 0.
+	config.RegionSplitSize = "100KiB"
+	config.RegionSplitSizeMB = typeutil.ParseMBFromText(config.RegionSplitSize, defaultRegionSplitSize)
+	re.Empty(config.GetRegionSplitSize())
+	re.NoError(config.CheckRegionSize(defaultRegionMaxSize, 50))
 }