vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clientv3/integration: rename to 'mustWaitPinReady' 

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
release-3.3
Gyu-Ho Lee 2017-10-27 12:32:40 -07:00
parent 2cea13ba68
commit 5d169b866f
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientv3/integration/black_hole_test.go
View File

@ -48,7 +48,7 @@ func TestBlackholePutWithoutKeealiveEnabled(t *testing.T) {
defer cli.Close()
// wait for ep[0] to be pinned
waitPinReady(t, cli)
mustWaitPinReady(t, cli)
cli.SetEndpoints(clus.Members[0].GRPCAddr(), clus.Members[1].GRPCAddr())
clus.Members[0].Blackhole()

4
clientv3/integration/network_partition_test.go
View File

@ -82,7 +82,7 @@ func testBalancerUnderNetworkPartition(t *testing.T, op func(*clientv3.Client, c
defer cli.Close()
// wait for ep[0] to be pinned
waitPinReady(t, cli)
mustWaitPinReady(t, cli)
// add other endpoints for later endpoint switch
cli.SetEndpoints(clus.Members[0].GRPCAddr(), clus.Members[1].GRPCAddr(), clus.Members[2].GRPCAddr())
@ -144,7 +144,7 @@ func testBalancerUnderNetworkPartitionWatch(t *testing.T, isolateLeader bool) {
defer watchCli.Close()
// wait for eps[target] to be pinned
waitPinReady(t, watchCli)
mustWaitPinReady(t, watchCli)
// add all eps to list, so that when the original pined one fails
// the client can switch to other available eps

6
clientv3/integration/server_shutdown_test.go
View File

@ -48,7 +48,7 @@ func TestBalancerUnderServerShutdownWatch(t *testing.T) {
defer watchCli.Close()
// wait for eps[lead] to be pinned
waitPinReady(t, watchCli)
mustWaitPinReady(t, watchCli)
// add all eps to list, so that when the original pined one fails
// the client can switch to other available eps
@ -158,7 +158,7 @@ func testBalancerUnderServerShutdownMutable(t *testing.T, op func(*clientv3.Clie
defer cli.Close()
// wait for eps[0] to be pinned
waitPinReady(t, cli)
mustWaitPinReady(t, cli)
// add all eps to list, so that when the original pined one fails
// the client can switch to other available eps
@ -216,7 +216,7 @@ func testBalancerUnderServerShutdownImmutable(t *testing.T, op func(*clientv3.Cl
defer cli.Close()
// wait for eps[0] to be pinned
waitPinReady(t, cli)
mustWaitPinReady(t, cli)
// add all eps to list, so that when the original pined one fails
// the client can switch to other available eps

5
clientv3/integration/util.go
View File

@ -22,8 +22,9 @@ import (
"github.com/coreos/etcd/clientv3"
)
// waitPinReady waits until connection is up (new pinned address).
func waitPinReady(t *testing.T, cli *clientv3.Client) {
// mustWaitPinReady waits up to 3-second until connection is up (pin endpoint).
// Fatal on time-out.
func mustWaitPinReady(t *testing.T, cli *clientv3.Client) {
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
_, err := cli.Get(ctx, "foo")
cancel()