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

Merge "Fix flaky test - testPartialConnectivity"

Browse Source
This commit is contained in:
Lucas Lin
2019-09-05 11:40:01 +00:00
committed by Gerrit Code Review
parent df6248fe83 a878f700d3
commit 44190d3d18
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2188,7 +2188,6 @@ public class ConnectivityServiceTest {
} }
@Test @Test
@FlakyTest(bugId = 140306320)
public void testPartialConnectivity() throws Exception { public void testPartialConnectivity() throws Exception {
// Register network callback. // Register network callback.
NetworkRequest request = new NetworkRequest.Builder() NetworkRequest request = new NetworkRequest.Builder()
@@ -2261,9 +2260,8 @@ public class ConnectivityServiceTest {
// If user accepted partial connectivity network before, // If user accepted partial connectivity network before,
// NetworkMonitor#setAcceptPartialConnectivity() will be called in // NetworkMonitor#setAcceptPartialConnectivity() will be called in
// ConnectivityService#updateNetworkInfo(). // ConnectivityService#updateNetworkInfo().
waitForIdle();
verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity();
callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent);
verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity();
callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent);
nc = callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); nc = callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent);
assertFalse(nc.hasCapability(NET_CAPABILITY_PARTIAL_CONNECTIVITY)); assertFalse(nc.hasCapability(NET_CAPABILITY_PARTIAL_CONNECTIVITY));
@@ -2283,9 +2281,8 @@ public class ConnectivityServiceTest {
// If user accepted partial connectivity network before, // If user accepted partial connectivity network before,
// NetworkMonitor#setAcceptPartialConnectivity() will be called in // NetworkMonitor#setAcceptPartialConnectivity() will be called in
// ConnectivityService#updateNetworkInfo(). // ConnectivityService#updateNetworkInfo().
waitForIdle();
verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity();
callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent);
verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity();
callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent);
assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork()); assertEquals(mWiFiNetworkAgent.getNetwork(), mCm.getActiveNetwork());
callback.expectCapabilitiesWith(NET_CAPABILITY_PARTIAL_CONNECTIVITY, mWiFiNetworkAgent); callback.expectCapabilitiesWith(NET_CAPABILITY_PARTIAL_CONNECTIVITY, mWiFiNetworkAgent);
@@ -2308,9 +2305,8 @@ public class ConnectivityServiceTest {
// valid, because ConnectivityService calls setAcceptPartialConnectivity before it calls // valid, because ConnectivityService calls setAcceptPartialConnectivity before it calls
// notifyNetworkConnected. // notifyNetworkConnected.
mWiFiNetworkAgent.connectWithPartialValidConnectivity(); mWiFiNetworkAgent.connectWithPartialValidConnectivity();
waitForIdle();
verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity();
callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent);
verify(mWiFiNetworkAgent.mNetworkMonitor, times(1)).setAcceptPartialConnectivity();
callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent); callback.expectCallback(CallbackRecord.LOSING, mCellNetworkAgent);
callback.expectCapabilitiesWith( callback.expectCapabilitiesWith(
NET_CAPABILITY_PARTIAL_CONNECTIVITY | NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent); NET_CAPABILITY_PARTIAL_CONNECTIVITY | NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent);