Merge branch 'schedule_by_peer' of https://github.com/Yisaer/pd into …

…schedule_by_peer

Makefile

@@ -165,7 +165,7 @@ test-with-cover: install-go-tools dashboard-ui
 	done
 	@$(FAILPOINT_DISABLE)
 
-check: install-go-tools check-all check-plugin errdoc check-missing-tests docker-build-test
+check: install-go-tools check-all check-plugin errdoc check-testing-t docker-build-test
 
 check-all: static lint tidy
 	@echo "checking"
@@ -200,8 +200,8 @@ docker-build-test:
 	fi
 	docker build --no-cache -t tikv/pd .
 
-check-missing-tests:
-	./scripts/check-missing-tests.sh
+check-testing-t:
+	./scripts/check-testing-t.sh
 
 simulator: export GO111MODULE=on
 simulator:

pkg/autoscaling/prometheus_test.go

@@ -23,7 +23,6 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
-	"testing"
 	"time"
 
 	. "github.com/pingcap/check"
@@ -41,10 +40,6 @@ const (
 	instanceCount = 3
 )
 
-func TestPrometheus(t *testing.T) {
-	TestingT(t)
-}
-
 var _ = Suite(&testPrometheusQuerierSuite{})
 
 var podNameTemplate = map[ComponentType]string{

pkg/encryption/config_test.go

@@ -14,17 +14,12 @@
 package encryption
 
 import (
-	"testing"
 	"time"
 
 	. "github.com/pingcap/check"
 	"github.com/tikv/pd/pkg/typeutil"
 )
 
-func TestConfig(t *testing.T) {
-	TestingT(t)
-}
-
 type testConfigSuite struct{}
 
 var _ = Suite(&testConfigSuite{})

pkg/encryption/crypter_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/encryptionpb"
 )
 
-func TestCrypter(t *testing.T) {
+func Test(t *testing.T) {
 	TestingT(t)
 }
 

pkg/encryption/master_key_test.go

@@ -16,16 +16,11 @@ package encryption
 import (
 	"encoding/hex"
 	"io/ioutil"
-	"testing"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/encryptionpb"
 )
 
-func TestMasterKey(t *testing.T) {
-	TestingT(t)
-}
-
 type testMasterKeySuite struct{}
 
 var _ = Suite(&testMasterKeySuite{})

pkg/encryption/region_crypter_test.go

@@ -16,18 +16,13 @@ package encryption
 import (
 	"crypto/aes"
 	"crypto/cipher"
-	"testing"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/encryptionpb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 )
 
-func TestRegionCrypter(t *testing.T) {
-	TestingT(t)
-}
-
 type testRegionCrypterSuite struct{}
 
 var _ = Suite(&testRegionCrypterSuite{})

pkg/typeutil/comparison_test.go

@@ -20,7 +20,7 @@ import (
 	. "github.com/pingcap/check"
 )
 
-func TestComparison(t *testing.T) {
+func TestTypeUtil(t *testing.T) {
 	TestingT(t)
 }
 

pkg/typeutil/conversion_test.go

@@ -14,15 +14,9 @@
 package typeutil
 
 import (
-	"testing"
-
 	. "github.com/pingcap/check"
 )
 
-func TestConversion(t *testing.T) {
-	TestingT(t)
-}
-
 var _ = Suite(&testUint64BytesSuite{})
 
 type testUint64BytesSuite struct{}

pkg/typeutil/size_test.go

@@ -15,15 +15,10 @@ package typeutil
 
 import (
 	"encoding/json"
-	"testing"
 
 	. "github.com/pingcap/check"
 )
 
-func TestSize(t *testing.T) {
-	TestingT(t)
-}
-
 var _ = Suite(&testSizeSuite{})
 
 type testSizeSuite struct {

scripts/check-missing-tests.sh → scripts/check-testing-t.sh

@@ -11,4 +11,14 @@ if [ "$res" ]; then
   exit 1
 fi
 
+# Check if there are duplicated `TestingT` in package.
+
+res=$(grep -r --include=\*_test.go "TestingT(" . | cut -f1 | xargs -L 1 dirname | sort | uniq -d)
+
+if [ "$res" ]; then
+  echo "following packages may have duplicated TestingT:"
+  echo "$res"
+  exit 1
+fi
+
 exit 0

tools/pd-analysis/analysis/parse_log_test.go

@@ -20,7 +20,7 @@ import (
 	. "github.com/pingcap/check"
 )
 
-func TestParser(t *testing.T) {
+func Test(t *testing.T) {
 	TestingT(t)
 }
 

tools/pd-analysis/analysis/transfer_counter_test.go

@@ -14,15 +14,9 @@
 package analysis
 
 import (
-	"testing"
-
 	. "github.com/pingcap/check"
 )
 
-func TestCounter(t *testing.T) {
-	TestingT(t)
-}
-
 var _ = Suite(&testTransferRegionCounter{})
 
 type testTransferRegionCounter struct{}