make lint

Signed-off-by: joccau <zak.zhao@pingcap.cn>

pkg/owner/manager.go

@@ -446,8 +446,9 @@ func GetOwnerOpValue(ctx context.Context, etcdCli *clientv3.Client, ownerPath, l
 	return op, errors.Trace(err)
 }
 
-// WatchOwner watches the ownerKey. It's exported for testing only.
-func WatchOwner(m Manager, ctx context.Context, etcdSession *concurrency.Session, key string, ownerRevision int64) {
+// WatchOwnerForTest watches the ownerKey.
+// This function is used to test watchOwner().
+func WatchOwnerForTest(ctx context.Context, m Manager, etcdSession *concurrency.Session, key string, ownerRevision int64) {
 	if ownerManager, ok := m.(*ownerManager); ok {
 		ownerManager.watchOwner(ctx, etcdSession, key, ownerRevision)
 	}

pkg/owner/manager_test.go

@@ -330,11 +330,12 @@ func TestWatchOwner(t *testing.T) {
 	require.NoError(t, err)
 
 	// watch the ownerKey with the `DELETE` event.
-	ctx2, _ := context.WithTimeout(ctx, time.Millisecond*300)
+	ctx2, cancel2 := context.WithTimeout(ctx, time.Millisecond*300)
+	defer cancel2()
 	watchDone := make(chan bool)
 	watched := false
 	go func() {
-		owner.WatchOwner(ownerManager, ctx2, session, ownerKey, createRevision)
+		owner.WatchOwnerForTest(ctx2, ownerManager, session, ownerKey, createRevision)
 		watchDone <- true
 	}()
 
@@ -345,15 +346,16 @@ func TestWatchOwner(t *testing.T) {
 	require.False(t, watched)
 
 	// delete the owner, and can watch the event.
-	g(client, DDLOwnerKey)
+	deleteLeader(client, DDLOwnerKey)
 	require.NoError(t, err)
 	watched = <-watchDone
 	require.True(t, watched)
 
 	// the ownerKey has been deleted, watch ownerKey again, it can be watched.
-	watched = false
+	ctx3, cancel3 := context.WithTimeout(ctx, time.Millisecond*300)
+	defer cancel3()
 	go func() {
-		owner.WatchOwner(ownerManager, ctx2, session, ownerKey, createRevision)
+		owner.WatchOwnerForTest(ctx3, ownerManager, session, ownerKey, createRevision)
 		watchDone <- true
 	}()