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

Merge "Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported" am: 1d2ad89424

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755630

Change-Id: I4539d7b5d254c09d629e4d0bdb8b5db4a9d9db96
This commit is contained in:
Treehugger Robot
2021-07-07 04:11:26 +00:00
committed by Automerger Merge Worker
parent b9b4ee6d0e 1d2ad89424
commit 5c7e4c179b
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

@@ -10219,10 +10219,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);
@@ -10270,12 +10267,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
@@ -10286,11 +10281,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())));
} }
@@ -10305,23 +10297,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
@@ -10359,9 +10347,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));