LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 7c05d6abdb 7cabb60411
commit f1b07ce2a5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -98,6 +98,7 @@ import com.android.server.connectivity.NetworkMonitor.CaptivePortalProbeResult;
import com.android.server.net.NetworkPinner; import com.android.server.net.NetworkPinner;
import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.net.NetworkPolicyManagerInternal;
import org.junit.Ignore;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.Spy; import org.mockito.Spy;
@@ -2413,6 +2414,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mCm.unregisterNetworkCallback(fgCallback); mCm.unregisterNetworkCallback(fgCallback);
} }
@Ignore // This test has instrinsic chances of spurious failures: ignore for continuous testing.
@SmallTest @SmallTest
public void testRequestBenchmark() throws Exception { public void testRequestBenchmark() throws Exception {
// TODO: turn this unit test into a real benchmarking test. // TODO: turn this unit test into a real benchmarking test.