Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "InetDiagSocketTest: ignore test that times out"

Browse Source 
am: 152ced4b87

Change-Id: Iff27cea9d43b6a044e0f91cc88fad46664b4660b
This commit is contained in:
Jeffrey Vander Stoep
2019-10-01 04:11:14 -07:00
committed by android-build-merger
parent 4355ad58c6 152ced4b87
commit 7dfbd004da
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/android/net/netlink/InetDiagSocketTest.java
View File

@@ -45,6 +45,7 @@ import androidx.test.runner.AndroidJUnit4;
import libcore.util.HexEncoding; import libcore.util.HexEncoding;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -200,6 +201,7 @@ public class InetDiagSocketTest {
checkGetConnectionOwnerUid("::1", "::1"); checkGetConnectionOwnerUid("::1", "::1");
} }
@Ignore("Times out on Marlin/Sailfish")
/* Verify fix for b/141603906 */ /* Verify fix for b/141603906 */
@Test @Test
public void testB141603906() throws Exception { public void testB141603906() throws Exception {