| commit | dadd2112f0db1333a8f8988d6a3600d5fb8ee592 | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Tue Oct 01 09:49:30 2019 +0200 |
| committer | Jeffrey Vander Stoep <jeffv@google.com> | Thu Oct 17 10:25:49 2019 +0000 |
| tree | 4712ac3c266d6e7f20643b3acab073be53ab9b02 | |
| parent | b3c533768dbf2207a06de73932a5fb299ba4824e [diff] |
InetDiagSocketTest: ignore test that times out Test: atest InetDiagSocketTest Change-Id: Ieef0ca291924c0d81b1110bd25020d57fa9f0fec Merged-In: Ieef0ca291924c0d81b1110bd25020d57fa9f0fec Bug: 141870193 Bug: 141459241 (cherry picked from commit 69b83c9b3c58999f2638857d5f36d1aae48195bb) Clean cherry pick.
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 {