integration-test: fix the unstable leader watch test (#1372)

Signed-off-by: nolouch <[email protected]>
tikv · Dec 12, 2018 · 0690f68 · 0690f68
1 parent acb9512
commit 0690f68
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 35 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -33,7 +33,7 @@
   branch = "master"
 
 [[constraint]]
-  name = "github.com/etcd-io/gofail"
+  name = "github.com/pingcap/gofail"
   branch = "master"
 
 [[constraint]]

diff --git a/hack/retool-install.sh b/hack/retool-install.sh
@@ -22,4 +22,4 @@ which retool >/dev/null || go get github.com/twitchtv/retool
 ./hack/retool add github.com/mgechev/revive 7773f47324c2bf1c8f7a5500aff2b6c01d3ed73b
 ./hack/retool add github.com/securego/gosec/cmd/gosec 1.0.0
 # go fail
-./hack/retool add github.com/etcd-io/gofail master
+./hack/retool add github.com/pingcap/gofail master
diff --git a/pkg/integration_test/leader_watch_test.go b/pkg/integration_test/leader_watch_test.go
@@ -17,8 +17,8 @@ import (
 	"context"
 	"time"
 
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/pd/pkg/testutil"
 	"github.com/pingcap/pd/server"
 )
@@ -44,14 +44,15 @@ func (s *integrationTestSuite) TestWatcher(c *C) {
 	time.Sleep(5 * time.Second)
 	pd3, err := cluster.Join()
 	c.Assert(err, IsNil)
-	gofail.Enable("github.com/pingcap/pd/server/delayWatcher", `sleep("15s")`)
+	gofail.Enable("github.com/pingcap/pd/server/delayWatcher", `pause`)
 	err = pd3.Run(context.Background())
 	c.Assert(err, IsNil)
 	time.Sleep(200 * time.Millisecond)
 	c.Assert(pd3.GetLeader().GetName(), Equals, pd1.GetConfig().Name)
 	pd1.Stop()
 	cluster.WaitLeader()
 	c.Assert(pd2.GetLeader().GetName(), Equals, pd2.GetConfig().Name)
+	gofail.Disable("github.com/pingcap/pd/server/delayWatcher")
 	testutil.WaitUntil(c, func(c *C) bool {
 		return c.Check(pd3.GetLeader().GetName(), Equals, pd2.GetConfig().Name)
 	})

diff --git a/server/tso_test.go b/server/tso_test.go
@@ -19,8 +19,8 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 )
 

diff --git a/tools.json b/tools.json
@@ -41,13 +41,9 @@
       "Commit": "5fb530cda357c16175f2c049577d2030de735b28"
     },
     {
-      "Repository": "github.com/etcd-io/gofail/runtime",
-      "Commit": "51ce9a71510a58bad5ae66ddd278ef28762a1550"
-    },
-    {
-      "Repository": "github.com/etcd-io/gofail",
-      "Commit": "51ce9a71510a58bad5ae66ddd278ef28762a1550"
+      "Repository": "github.com/pingcap/gofail",
+      "Commit": "e47081505b9cbcb513b138a2e45ff94a4bd5af4d"
     }
   ],
   "RetoolVersion": "1.3.7"
-}
+}
diff --git a/vendor/github.com/etcd-io/gofail/LICENSE → vendor/github.com/pingcap/gofail/LICENSE b/vendor/github.com/etcd-io/gofail/LICENSE → vendor/github.com/pingcap/gofail/LICENSE
diff --git a/vendor/github.com/etcd-io/gofail/NOTICE → vendor/github.com/pingcap/gofail/NOTICE b/vendor/github.com/etcd-io/gofail/NOTICE → vendor/github.com/pingcap/gofail/NOTICE
diff --git a/...b.com/etcd-io/gofail/runtime/failpoint.go → ...b.com/pingcap/gofail/runtime/failpoint.go b/...b.com/etcd-io/gofail/runtime/failpoint.go → ...b.com/pingcap/gofail/runtime/failpoint.go
diff --git a/...github.com/etcd-io/gofail/runtime/http.go → ...github.com/pingcap/gofail/runtime/http.go b/...github.com/etcd-io/gofail/runtime/http.go → ...github.com/pingcap/gofail/runtime/http.go
diff --git a/...hub.com/etcd-io/gofail/runtime/runtime.go → ...hub.com/pingcap/gofail/runtime/runtime.go b/...hub.com/etcd-io/gofail/runtime/runtime.go → ...hub.com/pingcap/gofail/runtime/runtime.go
diff --git a/...ithub.com/etcd-io/gofail/runtime/terms.go → ...ithub.com/pingcap/gofail/runtime/terms.go b/...ithub.com/etcd-io/gofail/runtime/terms.go → ...ithub.com/pingcap/gofail/runtime/terms.go