diff options
| author | Paul Hu <paulhu@google.com> | 2019-05-14 21:17:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-14 21:17:33 -0700 |
| commit | f672e96b8720b397e6a440b931dbd34d39167211 (patch) | |
| tree | 5a76afbe778a5259af331ac8823e1f3bdebcf090 | |
| parent | 019f54d32f6d202392a0f8e76988cfb92699654e (diff) | |
| parent | 910b72f10995fe376bfaef59ff15b204c6c15ae2 (diff) | |
| download | base-f672e96b8720b397e6a440b931dbd34d39167211.tar.gz | |
Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode"
am: 910b72f109
Change-Id: I670b9847a2e3b3b794ee4694a0838440cabdc39f
| -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); |