From 03ce2fa037a1b4d4950cb87eb8dc76e3acaef9ac Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Fri, 27 Oct 2017 14:47:37 -0700 Subject: [PATCH] clientv3/integration: remove client keepalive in network partition tests Those tests are about balancer endpoint switch, not about keepalive pings. Signed-off-by: Gyu-Ho Lee --- clientv3/integration/network_partition_test.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/clientv3/integration/network_partition_test.go b/clientv3/integration/network_partition_test.go index da09649f0..23dd1fce6 100644 --- a/clientv3/integration/network_partition_test.go +++ b/clientv3/integration/network_partition_test.go @@ -28,9 +28,7 @@ import ( "github.com/coreos/etcd/pkg/testutil" ) -var ( - errExpected = errors.New("expected error") -) +var errExpected = errors.New("expected error") // TestBalancerUnderNetworkPartitionPut tests when one member becomes isolated, // first Put request fails, and following retry succeeds with client balancer @@ -70,10 +68,8 @@ func testBalancerUnderNetworkPartition(t *testing.T, op func(*clientv3.Client, c // expect pin ep[0] ccfg := clientv3.Config{ - Endpoints: []string{clus.Members[0].GRPCAddr()}, - DialTimeout: 3 * time.Second, - DialKeepAliveTime: 2 * time.Second, - DialKeepAliveTimeout: 2 * time.Second, + Endpoints: []string{clus.Members[0].GRPCAddr()}, + DialTimeout: 3 * time.Second, } cli, err := clientv3.New(ccfg) if err != nil { @@ -95,7 +91,6 @@ func testBalancerUnderNetworkPartition(t *testing.T, op func(*clientv3.Client, c if err == nil { break } - if err != errExpected { t.Errorf("#%d: expected %v, got %v", i, errExpected, err) }