diff options
author | Mohannad Farrag <aymanm@google.com> | 2024-01-31 18:13:07 +0000 |
---|---|---|
committer | Mohannad Farrag <aymanm@google.com> | 2024-01-31 18:13:07 +0000 |
commit | 7b0ffa22387a5a2bb4d300afba7ad16ae62b8711 (patch) | |
tree | d2f7bb310f96e4263009270b39d60b173baa447f | |
parent | 64599586d3a5fff1723424825f155b37f9ed630a (diff) | |
download | cronet-7b0ffa22387a5a2bb4d300afba7ad16ae62b8711.tar.gz |
Apply crrev/c/5253448 to reduce flakiness
Test: atest NetHttpTests
Change-Id: I860e2735258bd7015a82608f40ebaf53c616165f
-rw-r--r-- | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java index 7e4967cc9..87a6ad94e 100644 --- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java +++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java @@ -1579,39 +1579,14 @@ public class BidirectionalStreamTest { assertThat(stream.isDone()).isTrue(); } - /** Callback that shuts down the engine when the stream has succeeded or failed. */ - private class ShutdownTestBidirectionalStreamCallback extends TestBidirectionalStreamCallback { - @Override - public void onSucceeded(BidirectionalStream stream, UrlResponseInfo info) { - mCronetEngine.shutdown(); - // Clear mCronetEngine so it doesn't get shut down second time in tearDown(). - mCronetEngine = null; - super.onSucceeded(stream, info); - } - - @Override - public void onFailed( - BidirectionalStream stream, UrlResponseInfo info, CronetException error) { - mCronetEngine.shutdown(); - // Clear mCronetEngine so it doesn't get shut down second time in tearDown(). - mCronetEngine = null; - super.onFailed(stream, info, error); - } - - @Override - public void onCanceled(BidirectionalStream stream, UrlResponseInfo info) { - mCronetEngine.shutdown(); - // Clear mCronetEngine so it doesn't get shut down second time in tearDown(). - mCronetEngine = null; - super.onCanceled(stream, info); - } - } - @Test @SmallTest + @IgnoreFor( + implementations = {CronetImplementation.AOSP_PLATFORM}, + reason = "ActiveRequestCount is not available in AOSP") public void testCronetEngineShutdown() throws Exception { // Test that CronetEngine cannot be shut down if there are any active streams. - TestBidirectionalStreamCallback callback = new ShutdownTestBidirectionalStreamCallback(); + TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); // Block callback when response starts to verify that shutdown fails // if there are active streams. callback.setAutoAdvance(false); @@ -1639,13 +1614,18 @@ public class BidirectionalStreamTest { callback.setAutoAdvance(true); callback.startNextRead(stream); callback.blockForDone(); + waitForActiveRequestCount(0); + mCronetEngine.shutdown(); } @Test @SmallTest + @IgnoreFor( + implementations = {CronetImplementation.AOSP_PLATFORM}, + reason = "ActiveRequestCount is not available in AOSP") public void testCronetEngineShutdownAfterStreamFailure() throws Exception { // Test that CronetEngine can be shut down after stream reports a failure. - TestBidirectionalStreamCallback callback = new ShutdownTestBidirectionalStreamCallback(); + TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); BidirectionalStream.Builder builder = mCronetEngine.newBidirectionalStreamBuilder( Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); @@ -1654,14 +1634,18 @@ public class BidirectionalStreamTest { callback.setFailure(FailureType.THROW_SYNC, ResponseStep.ON_READ_COMPLETED); callback.blockForDone(); assertThat(callback.mOnErrorCalled).isTrue(); - assertThat(mCronetEngine).isNull(); + waitForActiveRequestCount(0); + mCronetEngine.shutdown(); } @Test @SmallTest + @IgnoreFor( + implementations = {CronetImplementation.AOSP_PLATFORM}, + reason = "ActiveRequestCount is not available in AOSP") public void testCronetEngineShutdownAfterStreamCancel() throws Exception { // Test that CronetEngine can be shut down after stream is canceled. - TestBidirectionalStreamCallback callback = new ShutdownTestBidirectionalStreamCallback(); + TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); BidirectionalStream.Builder builder = mCronetEngine.newBidirectionalStreamBuilder( Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); @@ -1678,7 +1662,8 @@ public class BidirectionalStreamTest { stream.cancel(); callback.blockForDone(); assertThat(callback.mOnCanceledCalled).isTrue(); - assertThat(mCronetEngine).isNull(); + waitForActiveRequestCount(0); + mCronetEngine.shutdown(); } /* |