Merge changes If4deb106,Ib25d7658 am: 0388f0e47b am: 41a57af66a
am: ae278410f5 Change-Id: I4fa34b647e7b2408d4493cfb148ae7d8c24bd6e8
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user