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

Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported

Browse Source 
The test relied on waitForIdle to ensure diagnostics callbacks were called,
but as this may require several iterations in the handler queue, this makes
the test unreliable.

Use mockito timeouts on the verify() calls instead.

Bug: 192651465
Change-Id: Iae1704af7ae3649eae301c6aee223ac753629d55
Test: atest ConnectivityServiceTest
This commit is contained in:
Remi NGUYEN VAN
2021-07-05 06:59:15 +00:00
parent 6be4ebcb0a
commit 1f210f792a
1 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -10213,10 +10213,7 @@ public class ConnectivityServiceTest {
mService.registerConnectivityDiagnosticsCallback( mService.registerConnectivityDiagnosticsCallback(
mConnectivityDiagnosticsCallback, request, mContext.getPackageName()); mConnectivityDiagnosticsCallback, request, mContext.getPackageName());
// Block until all other events are done processing. verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
verify(mConnectivityDiagnosticsCallback)
.onConnectivityReportAvailable(argThat(report -> { .onConnectivityReportAvailable(argThat(report -> {
return INTERFACE_NAME.equals(report.getLinkProperties().getInterfaceName()) return INTERFACE_NAME.equals(report.getLinkProperties().getInterfaceName())
&& report.getNetworkCapabilities().hasTransport(TRANSPORT_CELLULAR); && report.getNetworkCapabilities().hasTransport(TRANSPORT_CELLULAR);
@@ -10264,12 +10261,10 @@ public class ConnectivityServiceTest {
throws Exception { throws Exception {
setUpConnectivityDiagnosticsCallback(); setUpConnectivityDiagnosticsCallback();
// Block until all other events are done processing.
HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onConnectivityReport fired // Verify onConnectivityReport fired
verify(mConnectivityDiagnosticsCallback).onConnectivityReportAvailable( verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
argThat(report -> areConnDiagCapsRedacted(report.getNetworkCapabilities()))); .onConnectivityReportAvailable(argThat(report ->
areConnDiagCapsRedacted(report.getNetworkCapabilities())));
} }
@Test @Test
@@ -10280,11 +10275,8 @@ public class ConnectivityServiceTest {
// cellular network agent // cellular network agent
mCellNetworkAgent.notifyDataStallSuspected(); mCellNetworkAgent.notifyDataStallSuspected();
// Block until all other events are done processing.
HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onDataStallSuspected fired // Verify onDataStallSuspected fired
verify(mConnectivityDiagnosticsCallback).onDataStallSuspected( verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS)).onDataStallSuspected(
argThat(report -> areConnDiagCapsRedacted(report.getNetworkCapabilities()))); argThat(report -> areConnDiagCapsRedacted(report.getNetworkCapabilities())));
} }
@@ -10299,23 +10291,19 @@ public class ConnectivityServiceTest {
final boolean hasConnectivity = true; final boolean hasConnectivity = true;
mService.reportNetworkConnectivity(n, hasConnectivity); mService.reportNetworkConnectivity(n, hasConnectivity);
// Block until all other events are done processing.
HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onNetworkConnectivityReported fired // Verify onNetworkConnectivityReported fired
verify(mConnectivityDiagnosticsCallback) verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
.onNetworkConnectivityReported(eq(n), eq(hasConnectivity)); .onNetworkConnectivityReported(eq(n), eq(hasConnectivity));
verify(mConnectivityDiagnosticsCallback).onConnectivityReportAvailable( verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
argThat(report -> areConnDiagCapsRedacted(report.getNetworkCapabilities()))); .onConnectivityReportAvailable(
argThat(report ->
areConnDiagCapsRedacted(report.getNetworkCapabilities())));
final boolean noConnectivity = false; final boolean noConnectivity = false;
mService.reportNetworkConnectivity(n, noConnectivity); mService.reportNetworkConnectivity(n, noConnectivity);
// Block until all other events are done processing.
HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Wait for onNetworkConnectivityReported to fire // Wait for onNetworkConnectivityReported to fire
verify(mConnectivityDiagnosticsCallback) verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
.onNetworkConnectivityReported(eq(n), eq(noConnectivity)); .onNetworkConnectivityReported(eq(n), eq(noConnectivity));
// Also expect a ConnectivityReport after NetworkMonitor asynchronously re-validates // Also expect a ConnectivityReport after NetworkMonitor asynchronously re-validates
@@ -10353,9 +10341,6 @@ public class ConnectivityServiceTest {
final boolean noConnectivity = false; final boolean noConnectivity = false;
doAsUid(Process.myUid() + 1, () -> mService.reportNetworkConnectivity(n, noConnectivity)); doAsUid(Process.myUid() + 1, () -> mService.reportNetworkConnectivity(n, noConnectivity));
// Block until all other events are done processing.
HandlerUtils.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Wait for onNetworkConnectivityReported to fire // Wait for onNetworkConnectivityReported to fire
verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS)) verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
.onNetworkConnectivityReported(eq(n), eq(noConnectivity)); .onNetworkConnectivityReported(eq(n), eq(noConnectivity));