planner, executor: fix unit test

pingcap · Mar 2, 2019 · 48c7a31 · 48c7a31
1 parent 68c6e5b
commit 48c7a31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/executor/show.go b/executor/show.go
@@ -20,7 +20,6 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"testing"
 	"time"
 
 	"github.com/coreos/etcd/integration"
@@ -50,6 +49,8 @@ import (
 	"github.com/pingcap/tidb/util/sqlexec"
 )
 
+// TestEtcdCluster is a mock etcd cluster used for test `show pump/drainer status`
+var TestEtcdCluster *integration.ClusterV3
 var etcdDialTimeout = 5 * time.Second
 
 const binlogTest = "/tmp/tidb"
@@ -1036,9 +1037,7 @@ func (e *ShowExec) fetchShowPumpOrDrainerStatus(kind string) error {
 // createRegistry returns an ectd registry
 func createRegistry(urls string) (*node.EtcdRegistry, error) {
 	if urls == binlogTest {
-		var t *testing.T
-		testEtcdCluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
-		etcdclient := etcd.NewClient(testEtcdCluster.RandClient(), node.DefaultRootPath)
+		etcdclient := etcd.NewClient(TestEtcdCluster.RandClient(), node.DefaultRootPath)
 		return node.NewEtcdRegistry(etcdclient, time.Duration(5)*time.Second), nil
 	}
 	ectdEndpoints, err := utils.ParseHostPortAddr(urls)

diff --git a/executor/show_test.go b/executor/show_test.go
@@ -413,12 +413,11 @@ func (s *testSuite2) TestShowEscape(c *C) {
 
 func (s *testSuite2) TestShowPumpOrDrainerStatus(c *C) {
 	var t *testing.T
-	testEtcdCluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
+	executor.TestEtcdCluster = integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
 
-	etcdclient := etcd.NewClient(testEtcdCluster.RandClient(), node.DefaultRootPath)
+	etcdclient := etcd.NewClient(executor.TestEtcdCluster.RandClient(), node.DefaultRootPath)
 	r := node.NewEtcdRegistry(etcdclient, time.Duration(5)*time.Second)
 	defer func() {
-		testEtcdCluster.Terminate(t)
 		r.Close()
 	}()
 
@@ -433,6 +432,5 @@ func (s *testSuite2) TestShowPumpOrDrainerStatus(c *C) {
 	c.Assert(err, IsNil)
 
 	tk := testkit.NewTestKit(c, s.store)
-	result := tk.MustQuery("SHOW PUMP STATUS")
-	c.Check(result.Rows(), HasLen, 0)
+	tk.MustQuery("SHOW PUMP STATUS").Check([][]interface{}{{"pump1", "127.0.0.1:8249", "online", "0", "1970-01-01 08:00:00"}})
 }