From 515807ff7208f2ce045b57df9958cde73b5bded9 Mon Sep 17 00:00:00 2001
From: Stefano Duo <stefanoduo@google.com>
Date: Wed, 12 Jul 2023 09:54:39 +0100
Subject: [PATCH] BidirectionalStreamTest: don't cancel and block in teardown

Calling callback.blockForDone() on a non-started stream's callback will
block until it timeouts (12s). Currently, only a single test within
BidirectionalStreamTest actually starts the stream. This means that
every other tests is calling callback.blockForDone() during teardown
for no reason at all and they will just get stuck for 12s.

Change-Id: Ia40cbc371b4e2450dcd92a3ad429ff4351931a21
---
 .../cts/src/android/net/http/cts/BidirectionalStreamTest.kt  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Cronet/tests/cts/src/android/net/http/cts/BidirectionalStreamTest.kt b/Cronet/tests/cts/src/android/net/http/cts/BidirectionalStreamTest.kt
index 0885f4f4b3..ece4a3414d 100644
--- a/Cronet/tests/cts/src/android/net/http/cts/BidirectionalStreamTest.kt
+++ b/Cronet/tests/cts/src/android/net/http/cts/BidirectionalStreamTest.kt
@@ -58,11 +58,6 @@ class BidirectionalStreamTest {
     @After
     @Throws(Exception::class)
     fun tearDown() {
-        // cancel active requests to enable engine shutdown.
-        stream?.let {
-            it.cancel()
-            callback.blockForDone()
-        }
         httpEngine.shutdown()
     }