diff options
| author | 2019-05-14 22:41:10 -0700 | |
|---|---|---|
| committer | 2019-05-14 22:41:10 -0700 | |
| commit | 73c0d48b14488c93b2f42a1e149e4be8499d3469 (patch) | |
| tree | 3e909e5143402720a2a336fa3425c7c9a016fb3f | |
| parent | bd62e07c445a74a48cd0a844de4486ede10ed6f4 (diff) | |
| parent | 273f61880e39f1dd66f48091c90c90b66de75890 (diff) | |
Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" am: 910b72f109 am: f672e96b87
am: 273f61880e
Change-Id: I1e93d4491e3d9e5a095ff4b6169b2f70e7b3b690
| -rw-r--r-- | tests/net/common/Android.bp | 1 | ||||
| -rw-r--r-- | tests/net/common/java/android/net/NetworkTest.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/net/common/Android.bp b/tests/net/common/Android.bp index 07525a6ea49c..db1ccb446ce3 100644 --- a/tests/net/common/Android.bp +++ b/tests/net/common/Android.bp @@ -24,6 +24,7 @@ java_library { "frameworks-net-testutils", "junit", "mockito-target-minus-junit4", + "platform-test-annotations", ], libs: [ "android.test.base.stubs", diff --git a/tests/net/common/java/android/net/NetworkTest.java b/tests/net/common/java/android/net/NetworkTest.java index bef66b27df62..38bc744a0a06 100644 --- a/tests/net/common/java/android/net/NetworkTest.java +++ b/tests/net/common/java/android/net/NetworkTest.java @@ -25,6 +25,7 @@ import android.net.LocalServerSocket; import android.net.LocalSocket; import android.net.LocalSocketAddress; import android.net.Network; +import android.platform.test.annotations.AppModeFull; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -74,6 +75,7 @@ public class NetworkTest { } @Test + @AppModeFull(reason = "Socket cannot bind in instant app mode") public void testBindSocketOfConnectedDatagramSocketThrows() throws Exception { final DatagramSocket mDgramSocket = new DatagramSocket(0, (InetAddress) Inet6Address.ANY); mDgramSocket.connect((InetAddress) Inet6Address.LOOPBACK, 53); |