summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2018-01-22 15:09:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-01-22 15:09:57 +0000
commite437a074fa62b7b42d7d8b374f7be31f386fe059 (patch)
treee218ee7bef8ace85aaade44e64653c2fd0d32abb
parente42e3c0c046615429385a6838c1c209f819399ac (diff)
parentbbd643c1e3bf9199de9bccf09d66c728571cc5e4 (diff)
Merge "Disable IpConnectivityMetricsTest."
-rw-r--r--tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
index 10d6deba61df..9f2cb921ea8e 100644
--- a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
+++ b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
@@ -66,6 +66,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -174,6 +175,7 @@ public class IpConnectivityMetricsTest {
}
@Test
+ @Ignore
public void testDefaultNetworkEvents() throws Exception {
final long cell = BitUtils.packBits(new int[]{NetworkCapabilities.TRANSPORT_CELLULAR});
final long wifi = BitUtils.packBits(new int[]{NetworkCapabilities.TRANSPORT_WIFI});
@@ -292,6 +294,7 @@ public class IpConnectivityMetricsTest {
}
@Test
+ @Ignore
public void testEndToEndLogging() throws Exception {
// TODO: instead of comparing textpb to textpb, parse textpb and compare proto to proto.
IpConnectivityLog logger = new IpConnectivityLog(mService.impl);