store/tikv: make tikv_integration_test more stable (pingcap#6113)

charsyam · Mar 22, 2018 · d3c5f7f · d3c5f7f
1 parent 838ac2f
commit d3c5f7f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 78 deletions.
diff --git a/store/mockstore/test_util.go b/store/mockstore/test_util.go
diff --git a/store/tikv/gcworker/gc_worker_test.go b/store/tikv/gcworker/gc_worker_test.go
@@ -14,7 +14,6 @@
 package gcworker
 
 import (
-	"flag"
 	"math"
 	"strconv"
 	"testing"
@@ -23,18 +22,14 @@ import (
 	gofail "github.com/coreos/gofail/runtime"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/errorpb"
+	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/session"
 	"github.com/pingcap/tidb/store/mockoracle"
 	"github.com/pingcap/tidb/store/mockstore"
 	"github.com/pingcap/tidb/store/tikv"
 	"golang.org/x/net/context"
 )
 
-var (
-	withTiKV = flag.Bool("with-tikv", false, "run tests with TiKV cluster started. (not use the mock server)")
-	pdAddrs  = flag.String("pd-addrs", "127.0.0.1:2379", "pd addrs")
-)
-
 func TestT(t *testing.T) {
 	TestingT(t)
 }
@@ -43,18 +38,19 @@ type testGCWorkerSuite struct {
 	store    tikv.Storage
 	oracle   *mockoracle.MockOracle
 	gcWorker *GCWorker
+	dom      *domain.Domain
 }
 
 var _ = Suite(&testGCWorkerSuite{})
 
 func (s *testGCWorkerSuite) SetUpTest(c *C) {
 	tikv.NewGCHandlerFunc = NewGCWorker
-	var err error
-	s.store, err = mockstore.NewTestTiKVStorage(*withTiKV, *pdAddrs)
+	store, err := mockstore.NewMockTikvStore()
+	s.store = store.(tikv.Storage)
 	c.Assert(err, IsNil)
 	s.oracle = &mockoracle.MockOracle{}
 	s.store.SetOracle(s.oracle)
-	_, err = session.BootstrapSession(s.store)
+	s.dom, err = session.BootstrapSession(s.store)
 	c.Assert(err, IsNil)
 	gcWorker, err := NewGCWorker(s.store)
 	c.Assert(err, IsNil)
@@ -64,6 +60,7 @@ func (s *testGCWorkerSuite) SetUpTest(c *C) {
 }
 
 func (s *testGCWorkerSuite) TearDownTest(c *C) {
+	s.dom.Close()
 	err := s.store.Close()
 	c.Assert(err, IsNil)
 }

diff --git a/store/tikv/lock_test.go b/store/tikv/lock_test.go
@@ -14,7 +14,6 @@
 package tikv
 
 import (
-	"fmt"
 	"math"
 	"runtime"
 	"time"
@@ -34,7 +33,6 @@ type testLockSuite struct {
 var _ = Suite(&testLockSuite{})
 
 func (s *testLockSuite) SetUpTest(c *C) {
-	fmt.Println("SetUpTest .... test Lock suite")
 	s.store = NewTestStore(c).(*tikvStore)
 }
 

diff --git a/store/tikv/scan_mock_test.go b/store/tikv/scan_mock_test.go
@@ -26,11 +26,9 @@ type testScanMockSuite struct {
 var _ = Suite(&testScanMockSuite{})
 
 func (s *testScanMockSuite) TestScanMultipleRegions(c *C) {
-	kvStore, err := newTestTiKVStore()
-	c.Assert(err, IsNil)
-	defer kvStore.Close()
+	store := NewTestStore(c).(*tikvStore)
+	defer store.Close()
 
-	store := kvStore.(*tikvStore)
 	txn, err := store.Begin()
 	c.Assert(err, IsNil)
 	for ch := byte('a'); ch <= byte('z'); ch++ {

diff --git a/store/tikv/store_test.go b/store/tikv/store_test.go
@@ -38,9 +38,11 @@ type testStoreSuite struct {
 var _ = Suite(&testStoreSuite{})
 
 func (s *testStoreSuite) SetUpTest(c *C) {
-	store, err := newTestTiKVStore()
-	c.Check(err, IsNil)
-	s.store = store.(*tikvStore)
+	s.store = NewTestStore(c).(*tikvStore)
+}
+
+func (s *testStoreSuite) TearDownTest(c *C) {
+	c.Assert(s.store.Close(), IsNil)
 }
 
 func (s *testStoreSuite) TestParsePath(c *C) {

diff --git a/store/tikv/ticlient_test.go b/store/tikv/ticlient_test.go
@@ -33,23 +33,8 @@ var (
 	pdAddrs            = flag.String("pd-addrs", "127.0.0.1:2379", "pd addrs")
 )
 
-func newTestTiKVStore() (kv.Storage, error) {
-	client, pdClient, err := mocktikv.NewTestClient(nil, nil, "")
-	if err != nil {
-		return nil, err
-	}
-	store, err := NewTestTiKVStore(client, pdClient, nil, nil)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	return store, err
-}
-
-// NewTestStore new a mockStore.
+// NewTestStore creates a kv.Storage for testing purpose.
 func NewTestStore(c *C) kv.Storage {
-	// duplicated code with mockstore NewTestTiKVStorage,
-	// but I have no idea to fix the cycle depenedence
-	// TODO: try to simplify the code later
 	if !flag.Parsed() {
 		flag.Parse()
 	}
@@ -63,7 +48,10 @@ func NewTestStore(c *C) kv.Storage {
 		return store
 	}
 
-	store, err := newTestTiKVStore()
+	client, pdClient, err := mocktikv.NewTestClient(nil, nil, "")
+	c.Assert(err, IsNil)
+
+	store, err := NewTestTiKVStore(client, pdClient, nil, nil)
 	c.Assert(err, IsNil)
 	return store
 }