replace juju/errors with pingcap/errors (go-mysql-org#356)

* replace juju/errors with pingcap/errors and unit test fix

Author: amyangfei

Gopkg.lock

@@ -34,8 +34,8 @@
  branch = "master"
 
 [[constraint]]
- branch = "master"
- name = "github.com/juju/errors"
+ name = "github.com/pingcap/errors"
+ version = "v0.11.0"
 
 [[constraint]]
  name = "github.com/satori/go.uuid"

Gopkg.toml

@@ -11,7 +11,7 @@ import (
 "sync"
 "time"
 
-"github.com/juju/errors"
+"github.com/pingcap/errors"
 "github.com/siddontang/go-log/log"
 "github.com/siddontang/go-mysql/client"
 "github.com/siddontang/go-mysql/dump"

canal/canal.go

@@ -7,8 +7,8 @@ import (
 "testing"
 "time"
 
-"github.com/juju/errors"
 . "github.com/pingcap/check"
+"github.com/pingcap/errors"
 "github.com/siddontang/go-log/log"
 "github.com/siddontang/go-mysql/mysql"
 )

canal/canal_test.go

@@ -6,7 +6,7 @@ import (
 "time"
 
 "github.com/BurntSushi/toml"
-"github.com/juju/errors"
+"github.com/pingcap/errors"
 "github.com/siddontang/go-mysql/mysql"
 )
 

canal/config.go

@@ -7,7 +7,7 @@ import (
 "strings"
 "time"
 
-"github.com/juju/errors"
+"github.com/pingcap/errors"
 "github.com/shopspring/decimal"
 "github.com/siddontang/go-log/log"
 "github.com/siddontang/go-mysql/mysql"

canal/dump.go

@@ -26,7 +26,7 @@ func (m *masterInfo) Update(pos mysql.Position) {
 }
 
 func (m *masterInfo) UpdateTimestamp(ts uint32) {
-log.Debugf("update master timestamp %s", ts)
+log.Debugf("update master timestamp %d", ts)
 
 m.Lock()
 m.timestamp = ts

canal/master.go

@@ -5,7 +5,7 @@ import (
 "regexp"
 "time"
 
-"github.com/juju/errors"
+"github.com/pingcap/errors"
 "github.com/satori/go.uuid"
 "github.com/siddontang/go-log/log"
 "github.com/siddontang/go-mysql/mysql"

canal/sync.go

@@ -6,7 +6,7 @@ import (
 "encoding/binary"
 "fmt"
 
-"github.com/juju/errors"
+"github.com/pingcap/errors"
 . "github.com/siddontang/go-mysql/mysql"
 "github.com/siddontang/go-mysql/packet"
 )

client/auth.go

@@ -6,14 +6,15 @@ import (
 "strings"
 "testing"
 
-"github.com/juju/errors"
 . "github.com/pingcap/check"
+"github.com/pingcap/errors"
 "github.com/siddontang/go-mysql/test_util/test_keys"
 
 "github.com/siddontang/go-mysql/mysql"
 )
 
 var testHost = flag.String("host", "127.0.0.1", "MySQL server host")
+
 // We cover the whole range of MySQL server versions using docker-compose to bind them to different ports for testing.
 // MySQL is constantly updating auth plugin to make it secure:
 // starting from MySQL 8.0.4, a new auth plugin is introduced, causing plain password auth to fail with error:
@@ -134,9 +135,9 @@ func (s *clientTestSuite) TestConn_TLS_Certificate(c *C) {
 if err == nil {
 c.Fatal("expected error")
 }
-if !strings.Contains(errors.Details(err), "certificate is not valid for any names") &&
-!strings.Contains(errors.Details(err), "certificate is valid for") {
-c.Fatalf("expected errors for server name verification, but got unknown error: %s", errors.Details(err))
+if !strings.Contains(errors.ErrorStack(err), "certificate is not valid for any names") &&
+!strings.Contains(errors.ErrorStack(err), "certificate is valid for") {
+c.Fatalf("expected errors for server name verification, but got unknown error: %s", errors.ErrorStack(err))
 }
 }
 
@@ -394,4 +395,4 @@ func (s *clientTestSuite) TestStmt_Trans(c *C) {
 
 str, _ = r.GetString(0, 0)
 c.Assert(str, Equals, `abc`)
-}
+}