owner: migrate test-infra to testify

owner/fail_test.go

@@ -24,80 +24,66 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/pingcap/check"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/parser/terror"
+
 	"github.com/pingcap/tidb/util/logutil"
-	"github.com/pingcap/tidb/util/testleak"
+	"github.com/stretchr/testify/require"
 	"go.etcd.io/etcd/clientv3"
 	"google.golang.org/grpc"
 )
 
 // Ignore this test on the windows platform, because calling unix socket with address in
 // host:port format fails on windows.
 func TestT(t *testing.T) {
-	CustomVerboseFlag = true
 	logLevel := os.Getenv("log_level")
 	err := logutil.InitLogger(logutil.NewLogConfig(logLevel, "", "", logutil.EmptyFileLogConfig, false))
 	if err != nil {
 		t.Fatal(err)
 	}
-	TestingT(t)
-}
-
-var _ = Suite(&testSuite{})
-
-type testSuite struct {
-}
-
-func (s *testSuite) SetUpSuite(c *C) {
-}
-
-func (s *testSuite) TearDownSuite(c *C) {
 }
 
 var (
 	dialTimeout = 5 * time.Second
 	retryCnt    = math.MaxInt32
 )
 
-func (s *testSuite) TestFailNewSession(c *C) {
+func TestFailNewSession(t *testing.T) {
+	t.Parallel()
 	os.Remove("new_session:0")
 	ln, err := net.Listen("unix", "new_session:0")
-	c.Assert(err, IsNil)
+	require.NoError(t, err)
 	addr := ln.Addr()
 	endpoints := []string{fmt.Sprintf("%s://%s", addr.Network(), addr.String())}
-	c.Assert(err, IsNil)
+	require.Nil(t, err)
 	srv := grpc.NewServer(grpc.ConnectionTimeout(time.Minute))
 	var stop sync.WaitGroup
 	stop.Add(1)
 	go func() {
 		if err = srv.Serve(ln); err != nil {
-			c.Errorf("can't serve gRPC requests %v", err)
+			require.Errorf(t, err, "can't serve gRPC requests %v")
 		}
 		stop.Done()
 	}()
 
-	leakFunc := testleak.AfterTest(c)
 	defer func() {
 		srv.Stop()
 		stop.Wait()
-		leakFunc()
 	}()
 
 	func() {
 		cli, err := clientv3.New(clientv3.Config{
 			Endpoints:   endpoints,
 			DialTimeout: dialTimeout,
 		})
-		c.Assert(err, IsNil)
+		require.NoError(t, err)
 		defer func() {
 			if cli != nil {
 				cli.Close()
 			}
-			c.Assert(failpoint.Disable("github.com/pingcap/tidb/owner/closeClient"), IsNil)
+			require.Nil(t, failpoint.Disable("github.com/pingcap/tidb/owner/closeClient"))
 		}()
-		c.Assert(failpoint.Enable("github.com/pingcap/tidb/owner/closeClient", `return(true)`), IsNil)
+		require.NoError(t, err, failpoint.Enable("github.com/pingcap/tidb/owner/closeClient", `return(true)`))
 
 		// TODO: It takes more than 2s here in etcd client, the CI takes 5s to run this test.
 		// The config is hard coded, not way to control it outside.
@@ -107,27 +93,27 @@ func (s *testSuite) TestFailNewSession(c *C) {
 		// https://github.com/etcd-io/etcd/blob/ae9734ed278b7a1a7dfc82e800471ebbf9fce56f/clientv3/retry_interceptor.go#L63
 		_, err = NewSession(context.Background(), "fail_new_serssion", cli, retryCnt, ManagerSessionTTL)
 		isContextDone := terror.ErrorEqual(grpc.ErrClientConnClosing, err) || terror.ErrorEqual(context.Canceled, err)
-		c.Assert(isContextDone, IsTrue, Commentf("err %v", err))
+		require.True(t, isContextDone, "err %v", err)
 	}()
 
 	func() {
 		cli, err := clientv3.New(clientv3.Config{
 			Endpoints:   endpoints,
 			DialTimeout: dialTimeout,
 		})
-		c.Assert(err, IsNil)
+		require.NoError(t, err)
 		defer func() {
 			if cli != nil {
 				cli.Close()
 			}
-			c.Assert(failpoint.Disable("github.com/pingcap/tidb/owner/closeGrpc"), IsNil)
+			require.Nil(t, failpoint.Disable("github.com/pingcap/tidb/owner/closeGrpc"))
 		}()
-		c.Assert(failpoint.Enable("github.com/pingcap/tidb/owner/closeGrpc", `return(true)`), IsNil)
+		require.Nil(t, failpoint.Enable("github.com/pingcap/tidb/owner/closeGrpc", `return(false)`))
 
 		// TODO: It takes more than 2s here in etcd client, the CI takes 5s to run this test.
 		// The config is hard coded, not way to control it outside.
 		_, err = NewSession(context.Background(), "fail_new_serssion", cli, retryCnt, ManagerSessionTTL)
 		isContextDone := terror.ErrorEqual(grpc.ErrClientConnClosing, err) || terror.ErrorEqual(context.Canceled, err)
-		c.Assert(isContextDone, IsTrue, Commentf("err %v", err))
+		require.True(t, isContextDone, "err %v", err)
 	}()
 }

owner/main_test.go

@@ -0,0 +1,26 @@
+//Copyright 2021 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package owner
+
+import (
+	"testing"
+
+	"github.com/pingcap/tidb/util/testbridge"
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	testbridge.WorkaroundGoCheckFlags()
+	goleak.VerifyTestMain(m)
+}

owner/manager_test.go

@@ -20,14 +20,14 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/terror"
 	. "github.com/pingcap/tidb/ddl"
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/owner"
 	"github.com/pingcap/tidb/store/mockstore"
 	"github.com/pingcap/tidb/util/logutil"
+	"github.com/stretchr/testify/require"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/clientv3/concurrency"
 	"go.etcd.io/etcd/integration"
@@ -56,12 +56,12 @@ func TestSingle(t *testing.T) {
 	}
 	store, err := mockstore.NewMockStore()
 	if err != nil {
-		t.Fatal(err)
+		require.NoError(t, err)
 	}
 	defer func() {
 		err := store.Close()
 		if err != nil {
-			t.Fatal(err)
+			require.NoError(t, err)
 		}
 	}()
 
@@ -80,15 +80,15 @@ func TestSingle(t *testing.T) {
 	)
 	err = d.Start(nil)
 	if err != nil {
-		t.Fatalf("DDL start failed %v", err)
+		require.NoErrorf(t, err, "DDL start failed %v")
 	}
 	defer func() {
 		_ = d.Stop()
 	}()
 
 	isOwner := checkOwner(d, true)
 	if !isOwner {
-		t.Fatalf("expect true, got isOwner:%v", isOwner)
+		require.Emptyf(t, isOwner, "expet true, got isOowner:%v")
 	}
 
 	// test for newSession failed
@@ -98,27 +98,28 @@ func TestSingle(t *testing.T) {
 	err = manager.CampaignOwner()
 	if !terror.ErrorEqual(err, goctx.Canceled) &&
 		!terror.ErrorEqual(err, goctx.DeadlineExceeded) {
-		t.Fatalf("campaigned result don't match, err %v", err)
+		require.NoErrorf(t, err, "campaigned result don't match, err %v")
 	}
 	isOwner = checkOwner(d, true)
 	if !isOwner {
-		t.Fatalf("expect true, got isOwner:%v", isOwner)
+		require.NotEmptyf(t, isOwner, "expected true, got isOwner:%v")
 	}
 	// The test is used to exit campaign loop.
 	d.OwnerManager().Cancel()
 	isOwner = checkOwner(d, false)
 	if isOwner {
-		t.Fatalf("expect false, got isOwner:%v", isOwner)
+		require.Emptyf(t, isOwner, "expected false, got isOwner:%v")
 	}
 	time.Sleep(200 * time.Millisecond)
 	ownerID, _ := manager.GetOwnerID(goctx.Background())
 	// The error is ok to be not nil since we canceled the manager.
 	if ownerID != "" {
-		t.Fatalf("owner %s is not empty", ownerID)
+		require.Emptyf(t, ownerID, "owner %s is not empty")
 	}
 }
 
 func TestCluster(t *testing.T) {
+	t.Parallel()
 	if runtime.GOOS == "windows" {
 		t.Skip("integration.NewClusterV3 will create file contains a colon which is not allowed on Windows")
 	}
@@ -130,12 +131,12 @@ func TestCluster(t *testing.T) {
 	}()
 	store, err := mockstore.NewMockStore()
 	if err != nil {
-		t.Fatal(err)
+		require.NoError(t, err)
 	}
 	defer func() {
 		err := store.Close()
 		if err != nil {
-			t.Fatal(err)
+			require.NoError(t, err)
 		}
 	}()
 	clus := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 4})
@@ -153,11 +154,11 @@ func TestCluster(t *testing.T) {
 	)
 	err = d.Start(nil)
 	if err != nil {
-		t.Fatalf("DDL start failed %v", err)
+		require.NoErrorf(t, err, "DDL start failed %v")
 	}
 	isOwner := checkOwner(d, true)
 	if !isOwner {
-		t.Fatalf("expect true, got isOwner:%v", isOwner)
+		require.Emptyf(t, isOwner, "expect true, got isOwner:%v")
 	}
 	cli1 := clus.Client(1)
 	ic2 := infoschema.NewCache(2)
@@ -171,26 +172,26 @@ func TestCluster(t *testing.T) {
 	)
 	err = d1.Start(nil)
 	if err != nil {
-		t.Fatalf("DDL start failed %v", err)
+		require.NoErrorf(t, err, "DDL start failed %v")
 	}
 	isOwner = checkOwner(d1, false)
 	if isOwner {
-		t.Fatalf("expect false, got isOwner:%v", isOwner)
+		require.Emptyf(t, isOwner, "expect false, got isOwner:%v")
 	}
 
 	// Delete the leader key, the d1 become the owner.
 	cliRW := clus.Client(2)
 	err = deleteLeader(cliRW, DDLOwnerKey)
 	if err != nil {
-		t.Fatal(err)
+		require.NoError(t, err)
 	}
 	isOwner = checkOwner(d, false)
 	if isOwner {
-		t.Fatalf("expect false, got isOwner:%v", isOwner)
+		require.Emptyf(t, isOwner, "expect false, got isOwner:%v")
 	}
 	err = d.Stop()
 	if err != nil {
-		t.Fatal(err, IsNil)
+		require.NoErrorf(t, err, "DDL stop failed %v")
 	}
 	// d3 (not owner) stop
 	cli3 := clus.Client(3)
@@ -205,38 +206,38 @@ func TestCluster(t *testing.T) {
 	)
 	err = d3.Start(nil)
 	if err != nil {
-		t.Fatalf("DDL start failed %v", err)
+		require.NoErrorf(t, err, "DDL start failed %v")
 	}
 	defer func() {
 		err = d3.Stop()
 		if err != nil {
-			t.Fatal(err, IsNil)
+			require.NoErrorf(t, err, "DDL stop failed %v")
 		}
 	}()
 	isOwner = checkOwner(d3, false)
 	if isOwner {
-		t.Fatalf("expect false, got isOwner:%v", isOwner)
+		require.Emptyf(t, isOwner, "expect false, got isOwner:%v")
 	}
 	err = d3.Stop()
 	if err != nil {
-		t.Fatal(err, IsNil)
+		require.NoErrorf(t, err, "DDL stop failed %v")
 	}
 
 	// Cancel the owner context, there is no owner.
 	err = d1.Stop()
 	if err != nil {
-		t.Fatal(err, IsNil)
+		require.NoErrorf(t, err, "DDL stop failed %v")
 	}
 	session, err := concurrency.NewSession(cliRW)
 	if err != nil {
-		t.Fatalf("new session failed %v", err)
+		require.NoErrorf(t, err, "new session failed %v")
 	}
 	elec := concurrency.NewElection(session, DDLOwnerKey)
 	logPrefix := fmt.Sprintf("[ddl] %s ownerManager %s", DDLOwnerKey, "useless id")
 	logCtx := logutil.WithKeyValue(context.Background(), "owner info", logPrefix)
 	_, err = owner.GetOwnerInfo(goctx.Background(), logCtx, elec, "useless id")
 	if !terror.ErrorEqual(err, concurrency.ErrElectionNoLeader) {
-		t.Fatalf("get owner info result don't match, err %v", err)
+		require.NoErrorf(t, err, "get owner info result don't match, err %v")
 	}
 }