Revert^2 "Batch Cronet tests"
This reverts commit 6dfb5268eec1aa3be5c1f6ef6facf4bd9504ba5e.
Reason for revert: ccrev/c/5237168 which disabled the consistently failing test that made the CI red. This should be safe to merge now.
Original change's description:
> Revert "Batch Cronet tests"
>
> This reverts commit dc82ec8f61696f003f138aa9fd3daf023d370b9b.
>
> Reason for revert: https://ci.chromium.org/ui/p/chromium/builders/ci/android-cronet-x86-dbg-marshmallow-tests/41637/blamelist
>
> Original change's description:
> > Batch Cronet tests
> >
> > Bug: 1432569
> > Cq-Include-Trybots: luci.chromium.try:android-cronet-x86-dbg-pie-tests,android-cronet-x86-dbg-oreo-tests,android-cronet-x86-dbg-nougat-tests,android-cronet-x86-dbg-11-tests,android-cronet-x86-dbg-lollipop-tests,android-cronet-x86-dbg-marshmallow-tests,android-cronet-x86-dbg-10-tests,android-cronet-x64-dbg-14-tests,android-cronet-x64-dbg-13-tests,android-cronet-x64-dbg-12-tests
> > Change-Id: Iec93c6109b90565a9a3c23e8abe13679790f8693
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5211020
> > Commit-Queue: Mohannad Farrag <aymanm@google.com>
> > Reviewed-by: Stefano Duo <stefanoduo@google.com>
> > Auto-Submit: Mohannad Farrag <aymanm@google.com>
> > Commit-Queue: Stefano Duo <stefanoduo@google.com>
> > Cr-Commit-Position: refs/heads/main@{#1248845}
>
> Bug: 1432569
> Change-Id: I005573f7502c4db37ab66b7d098c0c4f758a2edd
> Cq-Include-Trybots: luci.chromium.try:android-cronet-x86-dbg-pie-tests,android-cronet-x86-dbg-oreo-tests,android-cronet-x86-dbg-nougat-tests,android-cronet-x86-dbg-11-tests,android-cronet-x86-dbg-lollipop-tests,android-cronet-x86-dbg-marshmallow-tests,android-cronet-x86-dbg-10-tests,android-cronet-x64-dbg-14-tests,android-cronet-x64-dbg-13-tests,android-cronet-x64-dbg-12-tests
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5225708
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Mohannad Farrag <aymanm@google.com>
> Cr-Commit-Position: refs/heads/main@{#1250780}
Bug: 1432569
Change-Id: I0fcb74ffcb27b95032018f9f7bc4458492ee190a
Cq-Include-Trybots: luci.chromium.try:android-cronet-x86-dbg-pie-tests,android-cronet-x86-dbg-oreo-tests,android-cronet-x86-dbg-nougat-tests,android-cronet-x86-dbg-11-tests,android-cronet-x86-dbg-lollipop-tests,android-cronet-x86-dbg-marshmallow-tests,android-cronet-x86-dbg-10-tests,android-cronet-x64-dbg-14-tests,android-cronet-x64-dbg-13-tests,android-cronet-x64-dbg-12-tests
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5237169
Commit-Queue: Mohannad Farrag <aymanm@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Mohannad Farrag <aymanm@google.com>
Cr-Commit-Position: refs/heads/main@{#1252077}
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 489434e..69c7f57 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
@@ -26,7 +26,7 @@
import org.junit.runner.RunWith;
import org.chromium.base.Log;
-import org.chromium.base.test.util.DoNotBatch;
+import org.chromium.base.test.util.Batch;
import org.chromium.net.CronetTestRule.CronetImplementation;
import org.chromium.net.CronetTestRule.IgnoreFor;
import org.chromium.net.CronetTestRule.RequiresMinAndroidApi;
@@ -51,7 +51,7 @@
import java.util.regex.Pattern;
/** Test functionality of BidirectionalStream interface. */
-@DoNotBatch(reason = "crbug/1459563")
+@Batch(Batch.UNIT_TESTS)
@RunWith(AndroidJUnit4.class)
@IgnoreFor(
implementations = {CronetImplementation.FALLBACK},
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java
index b2074bf..931245a 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUploadTest.java
@@ -15,7 +15,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.chromium.base.test.util.DoNotBatch;
+import org.chromium.base.test.util.Batch;
import org.chromium.net.CronetTestRule.CronetImplementation;
import org.chromium.net.CronetTestRule.IgnoreFor;
import org.chromium.net.impl.CronetUploadDataStream;
@@ -30,7 +30,7 @@
* Tests that directly drive {@code CronetUploadDataStream} and {@code UploadDataProvider} to
* simulate different ordering of reset, init, read, and rewind calls.
*/
-@DoNotBatch(reason = "crbug/1459563")
+@Batch(Batch.UNIT_TESTS)
@RunWith(AndroidJUnit4.class)
@IgnoreFor(
implementations = {CronetImplementation.FALLBACK, CronetImplementation.AOSP_PLATFORM},
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestHTTPSTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestHTTPSTest.java
index 4df5aab..d984b31 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestHTTPSTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestHTTPSTest.java
@@ -17,14 +17,14 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.chromium.base.test.util.DoNotBatch;
+import org.chromium.base.test.util.Batch;
import org.chromium.net.CronetTestRule.CronetImplementation;
import org.chromium.net.CronetTestRule.IgnoreFor;
import org.chromium.net.TestUrlRequestCallback.ResponseStep;
import org.chromium.net.test.ServerCertificate;
/** Test functionality of CronetUrlRequest when SSL is enabled. */
-@DoNotBatch(reason = "crbug/1459563")
+@Batch(Batch.UNIT_TESTS)
@RunWith(AndroidJUnit4.class)
public class CronetUrlRequestHTTPSTest {
private static final String TAG = CronetUrlRequestHTTPSTest.class.getSimpleName();
