Snap for 7571196 from 1121b8508a51e9bbae4e77117b065c130c839fe3 to sc-v2-release

Change-Id: Id29c5d147b087a161363bb3f3e7038b3a31f8d1a

1 files changed, 8 insertions, 0 deletions

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
index 3d48658..0b18783 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
@@ -1650,9 +1650,16 @@ public final class CallTest {
   }
 
   @Test public void cancelInFlightBeforeResponseReadThrowsIOE() throws Exception {
+    final CountDownLatch cancelSignal = new CountDownLatch(1);
+
     server.setDispatcher(new Dispatcher() {
       @Override public MockResponse dispatch(RecordedRequest request) {
         client.cancel("request");
+        try {
+          cancelSignal.await(10L, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            // Do nothing
+        }
         return new MockResponse().setBody("A");
       }
     });
@@ -1662,6 +1669,7 @@ public final class CallTest {
       client.newCall(request).execute();
       fail();
     } catch (IOException expected) {
+      cancelSignal.countDown();
     }
   }