[Cronet] Skip flaky tests from presubmit

Tests that enable disk storage cache are prone to flakiness.
If any test that enables disk storage cache does not shut down the
cronetEngine due to flake or for some reason, other disk storage
tests fail because the storage path is not freed up for the next
cronet engine.

This has been fixed upstream by making the CronetTestRule manage
the engine's lifetimes. See crrev/c/4574363.

This cl will be reverted once the fix makes it to downstream and
the tests have been deflaked

Bug: b/292298108
Bug: b/293141085
Test: atest NetHttpCoverageTests
Change-Id: I9715bb8bda1e22f599cc84a1a1b263c81f9e5c9f

4 files changed, 19 insertions, 0 deletions

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index d728ec924..a844c25c4 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -28,6 +28,8 @@ import android.os.Process;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 
+import com.android.testutils.SkipPresubmit;
+
 import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
@@ -847,6 +849,7 @@ public class CronetUrlRequestContextTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     // Tests that if CronetEngine is shut down on the network thread, an appropriate exception
     // is thrown.
     public void testShutDownEngineOnNetworkThread() throws Exception {
@@ -904,6 +907,7 @@ public class CronetUrlRequestContextTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     // Tests that if CronetEngine is shut down when reading from disk cache,
     // there isn't a crash. See crbug.com/486120.
     public void testShutDownEngineWhenReadingFromDiskCache() throws Exception {
@@ -1246,6 +1250,7 @@ public class CronetUrlRequestContextTest {
 
     @Test
     @SmallTest
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     public void testEnableHttpCacheDisk() throws Exception {
         CronetEngine cronetEngine =
                 createCronetEngineWithCache(CronetEngine.Builder.HTTP_CACHE_DISK);
@@ -1260,6 +1265,7 @@ public class CronetUrlRequestContextTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     public void testNoConcurrentDiskUsage() throws Exception {
         CronetEngine cronetEngine =
                 createCronetEngineWithCache(CronetEngine.Builder.HTTP_CACHE_DISK);
@@ -1280,6 +1286,7 @@ public class CronetUrlRequestContextTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     public void testEnableHttpCacheDiskNoHttp() throws Exception {
         CronetEngine cronetEngine =
                 createCronetEngineWithCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP);
@@ -1300,6 +1307,7 @@ public class CronetUrlRequestContextTest {
 
     @Test
     @SmallTest
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     public void testDisableCache() throws Exception {
         CronetEngine cronetEngine =
                 createCronetEngineWithCache(CronetEngine.Builder.HTTP_CACHE_DISK);
@@ -1332,6 +1340,7 @@ public class CronetUrlRequestContextTest {
 
     @Test
     @SmallTest
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     public void testEnableHttpCacheDiskNewEngine() throws Exception {
         CronetEngine cronetEngine =
                 createCronetEngineWithCache(CronetEngine.Builder.HTTP_CACHE_DISK);
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java
index 59dfeed4b..dc50d4afb 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/DiskStorageTest.java
@@ -15,6 +15,8 @@ import static org.chromium.net.CronetTestRule.getTestStorage;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 
+import com.android.testutils.SkipPresubmit;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -104,6 +106,7 @@ public class DiskStorageTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     // Crashing on Android Cronet Builder, see crbug.com/601409.
     public void testPurgeOldVersion() throws Exception {
         String testStorage = getTestStorage(getContext());
@@ -167,6 +170,7 @@ public class DiskStorageTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     // Tests that if cache version is current, Cronet does not purge the directory.
     public void testCacheVersionCurrent() throws Exception {
         // Initialize a CronetEngine and shut it down.
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
index 8c3ed567f..98fe4c457 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java
@@ -25,6 +25,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
 
+import com.android.testutils.SkipPresubmit;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.After;
@@ -218,6 +220,7 @@ public class ExperimentalOptionsTest {
     @Test
     @MediumTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     // Tests that basic Cronet functionality works when host cache persistence is enabled, and that
     // persistence works.
     public void testHostCachePersistence() throws Exception {
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
index 472ba25c0..6300c702a 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
@@ -14,6 +14,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SmallTest;
 
+import com.android.testutils.SkipPresubmit;
+
 import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
@@ -246,6 +248,7 @@ public class QuicTest {
     @Test
     @SmallTest
     @OnlyRunNativeCronet
+    @SkipPresubmit(reason = "b/293141085 Tests that enable disk cache are flaky")
     public void testMetricsWithQuic() throws Exception {
         ExperimentalCronetEngine cronetEngine = mBuilder.build();
         TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();