client/integration: try to fix tests

etcd-io · Sep 17, 2018 · 4c0b00a · 4c0b00a
1 parent c15fb60
commit 4c0b00a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go
@@ -439,6 +439,11 @@ func TestKVGetErrConnClosed(t *testing.T) {
 	cli := clus.Client(0)
 
 	donec := make(chan struct{})
+	if err := cli.Close(); err != nil {
+		t.Fatal(err)
+	}
+	clus.TakeClient(0)
+
 	go func() {
 		defer close(donec)
 		_, err := cli.Get(context.TODO(), "foo")
@@ -447,11 +452,6 @@ func TestKVGetErrConnClosed(t *testing.T) {
 		}
 	}()
 
-	if err := cli.Close(); err != nil {
-		t.Fatal(err)
-	}
-	clus.TakeClient(0)
-
 	select {
 	case <-time.After(integration.RequestWaitTimeout):
 		t.Fatal("kv.Get took too long")

diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go
@@ -291,6 +291,9 @@ func TestLeaseGrantErrConnClosed(t *testing.T) {
 
 	cli := clus.Client(0)
 	clus.TakeClient(0)
+	if err := cli.Close(); err != nil {
+		t.Fatal(err)
+	}
 
 	donec := make(chan struct{})
 	go func() {
@@ -303,10 +306,6 @@ func TestLeaseGrantErrConnClosed(t *testing.T) {
 		}
 	}()
 
-	if err := cli.Close(); err != nil {
-		t.Fatal(err)
-	}
-
 	select {
 	case <-time.After(integration.RequestWaitTimeout):
 		t.Fatal("le.Grant took too long")