Merge "InetDiagSocketTest: ignore test that times out" am: 152ced4b87

am: 7dfbd004da Change-Id: I34890df3f3f36a9a6c43c9635f87b9c9b096f497
2019-10-02 12:57:09 -07:00
parent 2e8be0cae3 7dfbd004da
commit b77f03f32c
1 changed files with 2 additions and 0 deletions
--- a/tests/net/java/android/net/netlink/InetDiagSocketTest.java
+++ b/tests/net/java/android/net/netlink/InetDiagSocketTest.java
@@ -45,6 +45,7 @@ import androidx.test.runner.AndroidJUnit4;
 import libcore.util.HexEncoding;

 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;

@@ -200,6 +201,7 @@ public class InetDiagSocketTest {
        checkGetConnectionOwnerUid("::1", "::1");
    }

+    @Ignore("Times out on Marlin/Sailfish")
    /* Verify fix for b/141603906 */
    @Test
    public void testB141603906() throws Exception {