commit a4ed9eb3d35c5b367f41a36a26aba03af36e46c8
author Hugo Benichi <hugobenichi@google.com> Fri May 26 01:04:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 26 01:04:44 2017 +0000
tree 694f6a8cefa0bef935ff31de7524a549766df015
parent d535328e6ba5d8afcbc6a239d390f82c6339ff51
parent 68f0403b91a6f38b0be19647b8911e7b55e0a631

Merge changes If4deb106,Ib25d7658 am: 0388f0e47b am: 41a57af66a am: ae278410f5
am: 68f0403b91

Change-Id: Id592d287a92c89320a682d660792b9b6c67e7563

tests/net/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 9c98efa..fb9d0c3 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -98,6 +98,7 @@
 import com.android.server.net.NetworkPinner;
 import com.android.server.net.NetworkPolicyManagerInternal;
 
+import org.junit.Ignore;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
@@ -2413,6 +2414,7 @@
         mCm.unregisterNetworkCallback(fgCallback);
     }
 
+    @Ignore // This test has instrinsic chances of spurious failures: ignore for continuous testing.
     @SmallTest
     public void testRequestBenchmark() throws Exception {
         // TODO: turn this unit test into a real benchmarking test.