use more suitable method

br/pkg/utils/key_test.go

@@ -88,6 +88,7 @@ func TestParseKey(t *testing.T) {
 
 	for _, tt := range testNotSupportKey {
 		_, err := ParseKey("notSupport", tt.any)
+		require.Error(t, err)
 		require.Regexp(t, "unknown format.*", err.Error())
 	}
 }

br/pkg/utils/progress_test.go

@@ -33,15 +33,15 @@ func TestProgress(t *testing.T) {
 	progress2.Inc()
 	time.Sleep(2 * time.Second)
 	p = <-pCh2
-	require.Regexp(t, `.*"P":"50\.00%".*`, p)
+	require.Contains(t, p, `"P":"50.00%"`)
 	progress2.Inc()
 	time.Sleep(2 * time.Second)
 	p = <-pCh2
-	require.Regexp(t, `.*"P":"100\.00%".*`, p)
+	require.Contains(t, p, `"P":"100.00%"`)
 	progress2.Inc()
 	time.Sleep(2 * time.Second)
 	p = <-pCh2
-	require.Regexp(t, `.*"P":"100\.00%".*`, p)
+	require.Contains(t, p, `"P":"100.00%"`)
 	progress2.Close()
 
 	pCh4 := make(chan string, 4)
@@ -52,12 +52,12 @@ func TestProgress(t *testing.T) {
 	progress4.Inc()
 	time.Sleep(2 * time.Second)
 	p = <-pCh4
-	require.Regexp(t, `.*"P":"25\.00%".*`, p)
+	require.Contains(t, p, `"P":"25.00%"`)
 	progress4.Inc()
 	progress4.Close()
 	time.Sleep(2 * time.Second)
 	p = <-pCh4
-	require.Regexp(t, `.*"P":"100\.00%".*`, p)
+	require.Contains(t, p, `"P":"100.00%"`)
 
 	pCh8 := make(chan string, 8)
 	progress8 := NewProgressPrinter("test", 8, false)
@@ -68,11 +68,11 @@ func TestProgress(t *testing.T) {
 	progress8.Inc()
 	time.Sleep(2 * time.Second)
 	p = <-pCh8
-	require.Regexp(t, `.*"P":"25\.00%".*`, p)
+	require.Contains(t, p, `"P":"25.00%"`)
 
 	// Cancel should stop progress at the current position.
 	cancel()
 	p = <-pCh8
-	require.Regexp(t, `.*"P":"25\.00%".*`, p)
+	require.Contains(t, p, `"P":"25.00%"`)
 	progress8.Close()
 }

br/pkg/utils/safe_point_test.go

@@ -23,15 +23,16 @@ func TestCheckGCSafepoint(t *testing.T) {
 	}
 	{
 		err := utils.CheckGCSafePoint(ctx, pdClient, 2333)
-		require.NotNil(t, err)
+		require.Error(t, err)
 	}
 	{
 		err := utils.CheckGCSafePoint(ctx, pdClient, 2333-1)
-		require.NotNil(t, err)
+		require.Error(t, err)
 	}
 	{
 		err := utils.CheckGCSafePoint(ctx, pdClient, 0)
-		require.Regexp(t, ".*GC safepoint 2333 exceed TS 0.*", err)
+		require.Error(t, err)
+		require.Regexp(t, ".*GC safepoint 2333 exceed TS 0.*", err.Error())
 	}
 }
 
@@ -125,7 +126,7 @@ func TestStartServiceSafePointKeeper(t *testing.T) {
 		if cs.ok {
 			require.NoErrorf(t, err, "case #%d, %v", i, cs)
 		} else {
-			require.NotNilf(t, err, "case #%d, %v", i, cs)
+			require.Errorf(t, err, "case #%d, %v", i, cs)
 		}
 		cancel()
 	}

br/pkg/utils/schema_test.go

@@ -103,7 +103,7 @@ func TestLoadBackupMeta(t *testing.T) {
 	)
 	tbl := dbs[dbName.String()].GetTable(tblName.String())
 	require.NoError(t, err)
-	require.Equal(t, 1, len(tbl.Files))
+	require.Len(t, tbl.Files, 1)
 	require.Equal(t, "1.sst", tbl.Files[0].Name)
 }
 
@@ -210,7 +210,7 @@ func TestLoadBackupMetaPartionTable(t *testing.T) {
 	)
 	tbl := dbs[dbName.String()].GetTable(tblName.String())
 	require.NoError(t, err)
-	require.Equal(t, 3, len(tbl.Files))
+	require.Len(t, tbl.Files, 3)
 	contains := func(name string) bool {
 		for i := range tbl.Files {
 			if tbl.Files[i].Name == name {
@@ -294,9 +294,9 @@ func BenchmarkLoadBackupMeta64(b *testing.B) {
 			),
 		)
 		require.NoError(b, err)
-		require.Equal(b, 1, len(dbs))
+		require.Len(b, dbs, 1)
 		require.Contains(b, dbs, "bench")
-		require.Equal(b, 64, len(dbs["bench"].Tables))
+		require.Len(b, dbs["bench"].Tables, 64)
 	}
 }
 
@@ -325,9 +325,9 @@ func BenchmarkLoadBackupMeta1024(b *testing.B) {
 			),
 		)
 		require.NoError(b, err)
-		require.Equal(b, 1, len(dbs))
+		require.Len(b, dbs, 1)
 		require.Contains(b, dbs, "bench")
-		require.Equal(b, 1024, len(dbs["bench"].Tables))
+		require.Len(b, dbs["bench"].Tables, 1024)
 	}
 }
 
@@ -356,8 +356,8 @@ func BenchmarkLoadBackupMeta10240(b *testing.B) {
 			),
 		)
 		require.NoError(b, err)
-		require.Equal(b, 1, len(dbs))
+		require.Len(b, dbs, 1)
 		require.Contains(b, dbs, "bench")
-		require.Equal(b, 10240, len(dbs["bench"].Tables))
+		require.Len(b, dbs["bench"].Tables, 10240)
 	}
 }