---

snehashah16 · snehashah16 · commit a2b0b78a31d6 · 2017-10-09T12:29:59.000-07:00
yaml --- r: 8551 b: refs/heads/snehashah-bugfix c: cd10082 h: refs/heads/master i: 8549: 3665234 8547: 56d3583 8543: cfb88dd
diff --git a/[refs] b/[refs]
@@ -73,4 +73,4 @@ refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb
 refs/tags/v0.23.0: e5405e1f6d144441b889acd3b6405fdcc3cdfd72
 refs/tags/v0.23.1: 30bcf8076ef9d71cc5a858d026cb907bb0954bec
 refs/tags/v0.24.0: b3cf61898d9c63d028fe088c14486721318d5fd5
-refs/heads/snehashah-bugfix: 540734e6e9bce69f47854d2aabfbe61f1ac53631
+refs/heads/snehashah-bugfix: cd10082ca18efc4375a7f0eb3c1660ad14e07ad2
diff --git a/branches/snehashah-bugfix/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java b/branches/snehashah-bugfix/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolIntegrationTest.java
@@ -19,15 +19,12 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
-import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import junit.framework.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -173,17 +170,8 @@ public void closeAfterInitialCreateDoesNotBlockIndefinitely() throws Exception {
   }
 
   @Test
-  public void closeWhenSessionsActiveDoesNotBlockIndefinitely() throws Exception {
+  public void closeWhenSessionsActiveFinishes() throws Exception {
     Session session = pool.getReadSession();
-    ListenableFuture<Void> future = pool.closeAsync();
-    try {
-      future.get(5, TimeUnit.SECONDS);
-      Assert.fail("Closure future should not have finished");
-    } catch (TimeoutException e) {
-      // expected
-    }
-    session.close();
-    // Now pool should close.
-    future.get();
+    pool.closeAsync().get();
   }
 }
