From 09a43e555a9eccb90d54f8834a82515cf0224856 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Mon, 25 Sep 2017 16:04:23 +0900 Subject: [PATCH] clientv3/integration: KV APIs match grpc.ErrClientConnClosing Signed-off-by: Gyu-Ho Lee --- clientv3/integration/kv_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go index 22c71019f7b9..eb6a6c0be8b3 100644 --- a/clientv3/integration/kv_test.go +++ b/clientv3/integration/kv_test.go @@ -442,7 +442,7 @@ func TestKVGetErrConnClosed(t *testing.T) { go func() { defer close(donec) _, err := cli.Get(context.TODO(), "foo") - if err != nil && err != grpc.ErrClientConnClosing { + if err != nil && err != context.DeadlineExceeded && err != grpc.ErrClientConnClosing { t.Fatalf("expected %v, got %v", grpc.ErrClientConnClosing, err) } }() @@ -791,8 +791,8 @@ func TestKVGetStoppedServerAndClose(t *testing.T) { // this Get fails and triggers an asynchronous connection retry _, err := cli.Get(ctx, "abc") cancel() - if !strings.Contains(err.Error(), "context deadline") { - t.Fatal(err) + if err != nil && err != context.DeadlineExceeded && err != grpc.ErrClientConnClosing { + t.Fatalf("expected %v or %v, got %v", context.DeadlineExceeded, grpc.ErrClientConnClosing, err) } } @@ -813,15 +813,15 @@ func TestKVPutStoppedServerAndClose(t *testing.T) { // grpc finds out the original connection is down due to the member shutdown. _, err := cli.Get(ctx, "abc") cancel() - if !strings.Contains(err.Error(), "context deadline") { - t.Fatal(err) + if err != context.DeadlineExceeded && err != grpc.ErrClientConnClosing { + t.Fatalf("expected %v, got %v", grpc.ErrClientConnClosing, err) } // this Put fails and triggers an asynchronous connection retry _, err = cli.Put(ctx, "abc", "123") cancel() - if !strings.Contains(err.Error(), "context deadline") { - t.Fatal(err) + if err != nil && err != context.DeadlineExceeded && err != grpc.ErrClientConnClosing { + t.Fatalf("expected %v or %v, got %v", context.DeadlineExceeded, grpc.ErrClientConnClosing, err) } }