ci: fix wrong boltdb dependency (#4530) (#4533)

* ci: fix wrong boltdb dependency Signed-off-by: nolouch <[email protected]> * fix test Signed-off-by: nolouch <[email protected]> * remove useless log test Signed-off-by: nolouch <[email protected]> Co-authored-by: nolouch <[email protected]>
tikv · Dec 31, 2021 · 5a16467 · 5a16467
1 parent 97596b1
commit 5a16467
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 33 deletions.
diff --git a/go.mod b/go.mod
@@ -47,6 +47,7 @@ require (
 	github.com/unrolled/render v1.0.1
 	github.com/urfave/negroni v0.3.0
 	// Fix panic in unit test with go >= 1.14, ref: etcd-io/bbolt#201 https://github.com/etcd-io/bbolt/pull/201
+	go.etcd.io/bbolt v1.3.5 // indirect
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
 	go.uber.org/goleak v1.1.12
 	go.uber.org/zap v1.19.0

diff --git a/go.sum b/go.sum
@@ -550,8 +550,9 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
+go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 h1:lWF4f9Nypl1ZqSb4gLeh/DGvBYVaUYHuiB93teOmwgc=
 go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
@@ -664,6 +665,7 @@ golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/pkg/logutil/log_test.go b/pkg/logutil/log_test.go
@@ -17,20 +17,14 @@ package logutil
 import (
 	"bytes"
 	"fmt"
-	"strings"
 	"testing"
 
-	"github.com/coreos/pkg/capnslog"
 	. "github.com/pingcap/check"
 	zaplog "github.com/pingcap/log"
 	log "github.com/sirupsen/logrus"
 	"go.uber.org/zap/zapcore"
 )
 
-const (
-	logPattern = `\d\d\d\d/\d\d/\d\d \d\d:\d\d:\d\d\.\d\d\d ([\w_%!$@.,+~-]+|\\.)+:\d+: \[(fatal|error|warning|info|debug)\] .*?\n`
-)
-
 func Test(t *testing.T) {
 	TestingT(t)
 }
@@ -81,32 +75,6 @@ func (s *testLogSuite) TestStringToLogFormatter(c *C) {
 	c.Assert(StringToLogFormatter("", true), DeepEquals, &textFormatter{})
 }
 
-// TestLogging assure log format and log redirection works.
-func (s *testLogSuite) TestLogging(c *C) {
-	conf := &zaplog.Config{Level: "warn", File: zaplog.FileLogConfig{}}
-	c.Assert(InitLogger(conf), IsNil)
-
-	log.SetOutput(s.buf)
-
-	tlog := capnslog.NewPackageLogger("github.com/tikv/pd/pkg/logutil", "test")
-
-	tlog.Infof("[this message should not be sent to buf]")
-	c.Assert(s.buf.Len(), Equals, 0)
-
-	tlog.Warningf("[this message should be sent to buf]")
-	entry, err := s.buf.ReadString('\n')
-	c.Assert(err, IsNil)
-	c.Assert(entry, Matches, logPattern)
-	// All capnslog log will be trigered in logutil/log.go
-	c.Assert(strings.Contains(entry, "log.go"), IsTrue)
-
-	log.Warnf("this message comes from logrus")
-	entry, err = s.buf.ReadString('\n')
-	c.Assert(err, IsNil)
-	c.Assert(entry, Matches, logPattern)
-	c.Assert(strings.Contains(entry, "log_test.go"), IsTrue)
-}
-
 func (s *testLogSuite) TestFileLog(c *C) {
 	c.Assert(InitFileLog(&zaplog.FileLogConfig{Filename: "/tmp"}), NotNil)
 	c.Assert(InitFileLog(&zaplog.FileLogConfig{Filename: "/tmp/test_file_log", MaxSize: 0}), IsNil)