*: move InitLogger from SetUpSuite to TestT (pingcap#4532)

javen-73 · Sep 15, 2017 · 117ff28 · 117ff28
1 parent 1006dab
commit 117ff28
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 36 deletions.
diff --git a/ddl/ddl_test.go b/ddl/ddl_test.go
@@ -37,6 +37,10 @@ import (
 
 func TestT(t *testing.T) {
 	CustomVerboseFlag = true
+	logLevel := os.Getenv("log_level")
+	logutil.InitLogger(&logutil.LogConfig{
+		Level: logLevel,
+	})
 	TestingT(t)
 }
 
@@ -143,10 +147,3 @@ func testDropIndex(c *C, ctx context.Context, d *ddl, dbInfo *model.DBInfo, tblI
 	checkHistoryJobArgs(c, ctx, job.ID, &historyJobArgs{ver: v, tbl: tblInfo})
 	return job
 }
-
-func init() {
-	logLevel := os.Getenv("log_level")
-	logutil.InitLogger(&logutil.LogConfig{
-		Level: logLevel,
-	})
-}
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -51,6 +51,10 @@ import (
 
 func TestT(t *testing.T) {
 	CustomVerboseFlag = true
+	logLevel := os.Getenv("log_level")
+	logutil.InitLogger(&logutil.LogConfig{
+		Level: logLevel,
+	})
 	TestingT(t)
 }
 
@@ -89,10 +93,6 @@ func (s *testSuite) SetUpSuite(c *C) {
 	}
 	_, err := tidb.BootstrapSession(s.store)
 	c.Assert(err, IsNil)
-	logLevel := os.Getenv("log_level")
-	logutil.InitLogger(&logutil.LogConfig{
-		Level: logLevel,
-	})
 }
 
 func (s *testSuite) TearDownSuite(c *C) {

diff --git a/new_session_test.go b/new_session_test.go
@@ -16,12 +16,10 @@ package tidb_test
 import (
 	"fmt"
 	"math"
-	"os"
 	"sync"
 	"time"
 
 	. "github.com/pingcap/check"
-	"github.com/pingcap/pd/pkg/logutil"
 	"github.com/pingcap/tidb"
 	"github.com/pingcap/tidb/context"
 	"github.com/pingcap/tidb/domain"
@@ -37,17 +35,6 @@ import (
 	"github.com/pingcap/tidb/util/testleak"
 )
 
-var once sync.Once
-
-func setLogLevelFromEnv() {
-	once.Do(func() {
-		logLevel := os.Getenv("log_level")
-		logutil.InitLogger(&logutil.LogConfig{
-			Level: logLevel,
-		})
-	})
-}
-
 var _ = Suite(&testSessionSuite{})
 
 type testSessionSuite struct {
@@ -70,7 +57,6 @@ func (s *testSessionSuite) SetUpSuite(c *C) {
 	tidb.SetStatsLease(0)
 	_, err = tidb.BootstrapSession(s.store)
 	c.Assert(err, IsNil)
-	setLogLevelFromEnv()
 }
 
 func (s *testSessionSuite) TearDownTest(c *C) {
@@ -378,7 +364,6 @@ func (s *testSchemaSuite) SetUpSuite(c *C) {
 	tidb.SetStatsLease(0)
 	_, err = tidb.BootstrapSession(s.store)
 	c.Assert(err, IsNil)
-	setLogLevelFromEnv()
 }
 
 func (s *testSchemaSuite) TestSchemaCheckerSQL(c *C) {

diff --git a/server/server_test.go b/server/server_test.go
@@ -28,13 +28,18 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/go-sql-driver/mysql"
 	. "github.com/pingcap/check"
+	"github.com/pingcap/pd/pkg/logutil"
 	"github.com/pingcap/tidb/executor"
 	tmysql "github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/printer"
 )
 
 func TestT(t *testing.T) {
 	CustomVerboseFlag = true
+	logLevel := os.Getenv("log_level")
+	logutil.InitLogger(&logutil.LogConfig{
+		Level: logLevel,
+	})
 	TestingT(t)
 }
 

diff --git a/server/tidb_test.go b/server/tidb_test.go
@@ -26,7 +26,6 @@ import (
 	"os"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/go-sql-driver/mysql"
 	"github.com/juju/errors"
 	. "github.com/pingcap/check"
@@ -43,7 +42,6 @@ var suite = new(TidbTestSuite)
 var _ = Suite(suite)
 
 func (ts *TidbTestSuite) SetUpSuite(c *C) {
-	log.SetLevel(log.ErrorLevel)
 	store, err := tidb.NewStore("memory:///tmp/tidb")
 	c.Assert(err, IsNil)
 	_, err = tidb.BootstrapSession(store)

diff --git a/sessionctx/binloginfo/binloginfo_test.go b/sessionctx/binloginfo/binloginfo_test.go
@@ -39,6 +39,10 @@ import (
 
 func TestT(t *testing.T) {
 	CustomVerboseFlag = true
+	logLevel := os.Getenv("log_level")
+	logutil.InitLogger(&logutil.LogConfig{
+		Level: logLevel,
+	})
 	TestingT(t)
 }
 
@@ -73,10 +77,6 @@ type testBinlogSuite struct {
 }
 
 func (s *testBinlogSuite) SetUpSuite(c *C) {
-	logLevel := os.Getenv("log_level")
-	logutil.InitLogger(&logutil.LogConfig{
-		Level: logLevel,
-	})
 	store, err := tikv.NewMockTikvStore()
 	c.Assert(err, IsNil)
 	s.store = store

diff --git a/store/store_test.go b/store/store_test.go
@@ -45,6 +45,10 @@ const (
 
 func TestT(t *testing.T) {
 	CustomVerboseFlag = true
+	logLevel := os.Getenv("log_level")
+	logutil.InitLogger(&logutil.LogConfig{
+		Level: logLevel,
+	})
 	TestingT(t)
 }
 
@@ -61,10 +65,6 @@ func (s *testKVSuite) SetUpSuite(c *C) {
 
 	cacheS, _ := tidb.NewStore(fmt.Sprintf("%s://%s", *testStore, *testStorePath))
 	c.Assert(cacheS, Equals, store)
-	logLevel := os.Getenv("log_level")
-	logutil.InitLogger(&logutil.LogConfig{
-		Level: logLevel,
-	})
 }
 
 func (s *testKVSuite) TearDownSuite(c *C) {