commit 152ced4b87269840a690d19f8b0177a563970a68
author Jeffrey Vander Stoep <jeffv@google.com> Tue Oct 01 10:44:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 01 10:44:24 2019 +0000
tree 206b082698829144755c59b1d83c961d20838fdb
parent d1c510f7493f6644c2d08a0af8a80c11f98ac592
parent 69b83c9b3c58999f2638857d5f36d1aae48195bb

Merge "InetDiagSocketTest: ignore test that times out"

tests/net/java/android/net/netlink/InetDiagSocketTest.java

diff --git a/tests/net/java/android/net/netlink/InetDiagSocketTest.java b/tests/net/java/android/net/netlink/InetDiagSocketTest.java
index b4f6e99..46e27c1 100644
--- a/tests/net/java/android/net/netlink/InetDiagSocketTest.java
+++ b/tests/net/java/android/net/netlink/InetDiagSocketTest.java
@@ -45,6 +45,7 @@
 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 @@
         checkGetConnectionOwnerUid("::1", "::1");
     }
 
+    @Ignore("Times out on Marlin/Sailfish")
     /* Verify fix for b/141603906 */
     @Test
     public void testB141603906() throws Exception {