commit f6c61f329abd80f4fcdff0595d4b87d3b61fc682
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 02 18:44:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 02 18:44:24 2019 +0000
tree 21eb474702cfbd41cb30d9097b8293c2ff072d37
parent 79373f74cd2d37d9da382fd4051b6417fd195a44
parent 6665297de91c7d50641f353ad1e3f6f8dfc668e0

Merge "Mark 3 tests as flaky."

tests/net/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index f6e986e..c63bf42 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -184,6 +184,7 @@
 import android.util.SparseArray;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -2187,6 +2188,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 140306320)
     public void testPartialConnectivity() throws Exception {
         // Register network callback.
         NetworkRequest request = new NetworkRequest.Builder()
@@ -3633,6 +3635,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 140305589)
     public void testPacketKeepalives() throws Exception {
         InetAddress myIPv4 = InetAddress.getByName("192.0.2.129");
         InetAddress notMyIPv4 = InetAddress.getByName("192.0.2.35");
@@ -5697,6 +5700,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 140305678)
     public void testTcpBufferReset() throws Exception {
         final String testTcpBufferSizes = "1,2,3,4,5,6";
         final NetworkRequest networkRequest = new NetworkRequest.Builder()