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

Merge "Fix a flake in ConnectivityDiagnostics"

Browse Source
This commit is contained in:
Treehugger Robot
2021-08-16 09:01:58 +00:00
committed by Gerrit Code Review
parent 381ea1f1b1 4da146bd2f
commit 1ac3e27399
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10359,6 +10359,12 @@ public class ConnectivityServiceTest {
mCellNetworkAgent.connect(true); mCellNetworkAgent.connect(true);
callback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent); callback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
callback.assertNoCallback(); callback.assertNoCallback();
// Make sure a report is sent and that the caps are suitably redacted.
verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
.onConnectivityReportAvailable(argThat(report ->
areConnDiagCapsRedacted(report.getNetworkCapabilities())));
reset(mConnectivityDiagnosticsCallback);
} }
private boolean areConnDiagCapsRedacted(NetworkCapabilities nc) { private boolean areConnDiagCapsRedacted(NetworkCapabilities nc) {
@@ -10371,17 +10377,6 @@ public class ConnectivityServiceTest {
&& ti.settingsRedacted; && ti.settingsRedacted;
} }
@Test
public void testConnectivityDiagnosticsCallbackOnConnectivityReportAvailable()
throws Exception {
setUpConnectivityDiagnosticsCallback();
// Verify onConnectivityReport fired
verify(mConnectivityDiagnosticsCallback, timeout(TIMEOUT_MS))
.onConnectivityReportAvailable(argThat(report ->
areConnDiagCapsRedacted(report.getNetworkCapabilities())));
}
@Test @Test
public void testConnectivityDiagnosticsCallbackOnDataStallSuspected() throws Exception { public void testConnectivityDiagnosticsCallbackOnDataStallSuspected() throws Exception {
setUpConnectivityDiagnosticsCallback(); setUpConnectivityDiagnosticsCallback();
@@ -10399,9 +10394,6 @@ public class ConnectivityServiceTest {
public void testConnectivityDiagnosticsCallbackOnConnectivityReported() throws Exception { public void testConnectivityDiagnosticsCallbackOnConnectivityReported() throws Exception {
setUpConnectivityDiagnosticsCallback(); setUpConnectivityDiagnosticsCallback();
// reset to ignore callbacks from setup
reset(mConnectivityDiagnosticsCallback);
final Network n = mCellNetworkAgent.getNetwork(); final Network n = mCellNetworkAgent.getNetwork();
final boolean hasConnectivity = true; final boolean hasConnectivity = true;
mService.reportNetworkConnectivity(n, hasConnectivity); mService.reportNetworkConnectivity(n, hasConnectivity);
@@ -10433,9 +10425,6 @@ public class ConnectivityServiceTest {
throws Exception { throws Exception {
setUpConnectivityDiagnosticsCallback(); setUpConnectivityDiagnosticsCallback();
// reset to ignore callbacks from setup
reset(mConnectivityDiagnosticsCallback);
// report known Connectivity from a different uid. Verify that network is not re-validated // report known Connectivity from a different uid. Verify that network is not re-validated
// and this callback is not notified. // and this callback is not notified.
final Network n = mCellNetworkAgent.getNetwork(); final Network n = mCellNetworkAgent.getNetwork();