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

am: 7cabb60411

Change-Id: Id592d287a92c89320a682d660792b9b6c67e7563
This commit is contained in:
Hugo Benichi
2017-05-26 01:04:44 +00:00
committed by android-build-merger

View File

@@ -98,6 +98,7 @@ import com.android.server.connectivity.NetworkMonitor.CaptivePortalProbeResult;
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 @@ public class ConnectivityServiceTest extends AndroidTestCase {
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.