Merge branch 'master' into kv-testify

tikv · Jun 7, 2022 · 88472d2 · 88472d2
2 parents 27c9a5b + 4133b9f
commit 88472d2
Show file tree

Hide file tree

Showing 59 changed files with 797 additions and 478 deletions.
diff --git a/Makefile b/Makefile
@@ -144,7 +144,7 @@ install-tools:
 
 #### Static checks ####
 
-check: install-tools static tidy check-plugin errdoc check-testing-t
+check: install-tools static tidy generate-errdoc check-plugin check-test
 
 static: install-tools
 	@ echo "gofmt ..."
@@ -160,21 +160,22 @@ tidy:
 	@ go mod tidy
 	git diff go.mod go.sum | cat
 	git diff --quiet go.mod go.sum
-	
+
 	@ for mod in $(SUBMODULES); do cd $$mod && $(MAKE) tidy && cd - > /dev/null; done
 
+generate-errdoc: install-tools
+	@echo "generating errors.toml..."
+	./scripts/generate-errdoc.sh
+
 check-plugin:
-	@echo "checking plugin"
+	@echo "checking plugin..."
 	cd ./plugin/scheduler_example && $(MAKE) evictLeaderPlugin.so && rm evictLeaderPlugin.so
 
-errdoc: install-tools
-	@echo "generator errors.toml"
-	./scripts/check-errdoc.sh
-
-check-testing-t:
-	./scripts/check-testing-t.sh
+check-test:
+	@echo "checking test..."
+	./scripts/check-test.sh
 
-.PHONY: check static tidy check-plugin errdoc docker-build-test check-testing-t
+.PHONY: check static tidy generate-errdoc check-plugin check-test
 
 #### Test utils ####
 

diff --git a/pkg/apiutil/apiutil_test.go b/pkg/apiutil/apiutil_test.go
@@ -25,6 +25,7 @@ import (
 )
 
 func TestJsonRespondErrorOk(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	rd := render.New(render.Options{
 		IndentJSON: true,
@@ -43,6 +44,7 @@ func TestJsonRespondErrorOk(t *testing.T) {
 }
 
 func TestJsonRespondErrorBadInput(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	rd := render.New(render.Options{
 		IndentJSON: true,

diff --git a/pkg/assertutil/assertutil_test.go b/pkg/assertutil/assertutil_test.go
@@ -22,6 +22,7 @@ import (
 )
 
 func TestNilFail(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	var failErr error
 	checker := NewChecker(func() {

diff --git a/pkg/audit/audit_test.go b/pkg/audit/audit_test.go
@@ -32,6 +32,7 @@ import (
 )
 
 func TestLabelMatcher(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	matcher := &LabelMatcher{"testSuccess"}
 	labels1 := &BackendLabels{Labels: []string{"testFail", "testSuccess"}}
@@ -41,6 +42,7 @@ func TestLabelMatcher(t *testing.T) {
 }
 
 func TestPrometheusHistogramBackend(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	serviceAuditHistogramTest := prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
@@ -87,6 +89,7 @@ func TestPrometheusHistogramBackend(t *testing.T) {
 }
 
 func TestLocalLogBackendUsingFile(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	backend := NewLocalLogBackend(true)
 	fname := initLog()

diff --git a/pkg/autoscaling/calculation_test.go b/pkg/autoscaling/calculation_test.go
@@ -29,6 +29,7 @@ import (
 )
 
 func TestGetScaledTiKVGroups(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -213,6 +214,7 @@ func (q *mockQuerier) Query(options *QueryOptions) (QueryResult, error) {
 }
 
 func TestGetTotalCPUUseTime(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	querier := &mockQuerier{}
 	instances := []instance{
@@ -235,6 +237,7 @@ func TestGetTotalCPUUseTime(t *testing.T) {
 }
 
 func TestGetTotalCPUQuota(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	querier := &mockQuerier{}
 	instances := []instance{
@@ -257,6 +260,7 @@ func TestGetTotalCPUQuota(t *testing.T) {
 }
 
 func TestScaleOutGroupLabel(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	var jsonStr = []byte(`
 {
@@ -299,6 +303,7 @@ func TestScaleOutGroupLabel(t *testing.T) {
 }
 
 func TestStrategyChangeCount(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	var count uint64 = 2
 	strategy := &Strategy{

diff --git a/pkg/autoscaling/prometheus_test.go b/pkg/autoscaling/prometheus_test.go
@@ -181,6 +181,7 @@ func (c *normalClient) Do(_ context.Context, req *http.Request) (response *http.
 }
 
 func TestRetrieveCPUMetrics(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	client := &normalClient{
 		mockData: make(map[string]*response),
@@ -225,6 +226,7 @@ func (c *emptyResponseClient) Do(_ context.Context, req *http.Request) (r *http.
 }
 
 func TestEmptyResponse(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	client := &emptyResponseClient{}
 	querier := NewPrometheusQuerier(client)
@@ -252,6 +254,7 @@ func (c *errorHTTPStatusClient) Do(_ context.Context, req *http.Request) (r *htt
 }
 
 func TestErrorHTTPStatus(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	client := &errorHTTPStatusClient{}
 	querier := NewPrometheusQuerier(client)
@@ -277,6 +280,7 @@ func (c *errorPrometheusStatusClient) Do(_ context.Context, req *http.Request) (
 }
 
 func TestErrorPrometheusStatus(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	client := &errorPrometheusStatusClient{}
 	querier := NewPrometheusQuerier(client)
@@ -287,6 +291,7 @@ func TestErrorPrometheusStatus(t *testing.T) {
 }
 
 func TestGetInstanceNameFromAddress(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	testCases := []struct {
 		address              string
@@ -324,6 +329,7 @@ func TestGetInstanceNameFromAddress(t *testing.T) {
 }
 
 func TestGetDurationExpression(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	testCases := []struct {
 		duration           time.Duration

diff --git a/pkg/cache/cache_test.go b/pkg/cache/cache_test.go
@@ -24,6 +24,7 @@ import (
 )
 
 func TestExpireRegionCache(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -115,6 +116,7 @@ func sortIDs(ids []uint64) []uint64 {
 }
 
 func TestLRUCache(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	cache := newLRU(3)
 
@@ -192,6 +194,7 @@ func TestLRUCache(t *testing.T) {
 }
 
 func TestFifoCache(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	cache := NewFIFO(3)
 	cache.Put(1, "1")
@@ -219,6 +222,7 @@ func TestFifoCache(t *testing.T) {
 }
 
 func TestTwoQueueCache(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	cache := newTwoQueue(3)
 	cache.Put(1, "1")
@@ -303,6 +307,7 @@ func (pq PriorityQueueItemTest) ID() uint64 {
 }
 
 func TestPriorityQueue(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	testData := []PriorityQueueItemTest{0, 1, 2, 3, 4, 5}
 	pq := NewPriorityQueue(0)

diff --git a/pkg/codec/codec_test.go b/pkg/codec/codec_test.go
@@ -21,6 +21,7 @@ import (
 )
 
 func TestDecodeBytes(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	key := "abcdefghijklmnopqrstuvwxyz"
 	for i := 0; i < len(key); i++ {
@@ -31,6 +32,7 @@ func TestDecodeBytes(t *testing.T) {
 }
 
 func TestTableID(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	key := EncodeBytes([]byte("t\x80\x00\x00\x00\x00\x00\x00\xff"))
 	re.Equal(int64(0xff), key.TableID())

diff --git a/pkg/encryption/config_test.go b/pkg/encryption/config_test.go
@@ -23,6 +23,7 @@ import (
 )
 
 func TestAdjustDefaultValue(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	config := &Config{}
 	err := config.Adjust()
@@ -34,18 +35,21 @@ func TestAdjustDefaultValue(t *testing.T) {
 }
 
 func TestAdjustInvalidDataEncryptionMethod(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	config := &Config{DataEncryptionMethod: "unknown"}
 	re.NotNil(config.Adjust())
 }
 
 func TestAdjustNegativeRotationDuration(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	config := &Config{DataKeyRotationPeriod: typeutil.NewDuration(time.Duration(int64(-1)))}
 	re.NotNil(config.Adjust())
 }
 
 func TestAdjustInvalidMasterKeyType(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	config := &Config{MasterKey: MasterKeyConfig{Type: "unknown"}}
 	re.NotNil(config.Adjust())

diff --git a/pkg/encryption/crypter_test.go b/pkg/encryption/crypter_test.go
@@ -24,6 +24,7 @@ import (
 )
 
 func TestEncryptionMethodSupported(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	re.NotNil(CheckEncryptionMethodSupported(encryptionpb.EncryptionMethod_PLAINTEXT))
 	re.NotNil(CheckEncryptionMethodSupported(encryptionpb.EncryptionMethod_UNKNOWN))
@@ -33,6 +34,7 @@ func TestEncryptionMethodSupported(t *testing.T) {
 }
 
 func TestKeyLength(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	_, err := KeyLength(encryptionpb.EncryptionMethod_PLAINTEXT)
 	re.NotNil(err)
@@ -50,6 +52,7 @@ func TestKeyLength(t *testing.T) {
 }
 
 func TestNewIv(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	ivCtr, err := NewIvCTR()
 	re.NoError(err)
@@ -60,6 +63,7 @@ func TestNewIv(t *testing.T) {
 }
 
 func TestNewDataKey(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	for _, method := range []encryptionpb.EncryptionMethod{
 		encryptionpb.EncryptionMethod_AES128_CTR,
@@ -78,6 +82,7 @@ func TestNewDataKey(t *testing.T) {
 }
 
 func TestAesGcmCrypter(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	key, err := hex.DecodeString("ed568fbd8c8018ed2d042a4e5d38d6341486922d401d2022fb81e47c900d3f07")
 	re.NoError(err)

diff --git a/pkg/encryption/master_key_test.go b/pkg/encryption/master_key_test.go
@@ -24,6 +24,7 @@ import (
 )
 
 func TestPlaintextMasterKey(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	config := &encryptionpb.MasterKey{
 		Backend: &encryptionpb.MasterKey_Plaintext{
@@ -49,6 +50,7 @@ func TestPlaintextMasterKey(t *testing.T) {
 }
 
 func TestEncrypt(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	keyHex := "2f07ec61e5a50284f47f2b402a962ec672e500b26cb3aa568bb1531300c74806"
 	key, err := hex.DecodeString(keyHex)
@@ -64,6 +66,7 @@ func TestEncrypt(t *testing.T) {
 }
 
 func TestDecrypt(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	keyHex := "2f07ec61e5a50284f47f2b402a962ec672e500b26cb3aa568bb1531300c74806"
 	key, err := hex.DecodeString(keyHex)
@@ -80,6 +83,7 @@ func TestDecrypt(t *testing.T) {
 }
 
 func TestNewFileMasterKeyMissingPath(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	config := &encryptionpb.MasterKey{
 		Backend: &encryptionpb.MasterKey_File{
@@ -93,6 +97,7 @@ func TestNewFileMasterKeyMissingPath(t *testing.T) {
 }
 
 func TestNewFileMasterKeyMissingFile(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	dir, err := os.MkdirTemp("", "test_key_files")
 	re.NoError(err)
@@ -109,6 +114,7 @@ func TestNewFileMasterKeyMissingFile(t *testing.T) {
 }
 
 func TestNewFileMasterKeyNotHexString(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	dir, err := os.MkdirTemp("", "test_key_files")
 	re.NoError(err)
@@ -126,6 +132,7 @@ func TestNewFileMasterKeyNotHexString(t *testing.T) {
 }
 
 func TestNewFileMasterKeyLengthMismatch(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	dir, err := os.MkdirTemp("", "test_key_files")
 	re.NoError(err)
@@ -143,6 +150,7 @@ func TestNewFileMasterKeyLengthMismatch(t *testing.T) {
 }
 
 func TestNewFileMasterKey(t *testing.T) {
+	t.Parallel()
 	re := require.New(t)
 	key := "2f07ec61e5a50284f47f2b402a962ec672e500b26cb3aa568bb1531300c74806"
 	dir, err := os.MkdirTemp("", "test_key_files")