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

Merge "Make lingering delay 2000ms in testMultipleLingering"

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-25 09:11:42 +00:00
committed by Gerrit Code Review
parent 3a3bd277eb aeadd47abc
commit 47b95be1c9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,7 +502,7 @@ public class ConnectivityServiceTest {
// complete before callbacks are verified. // complete before callbacks are verified.
private static final int TEST_REQUEST_TIMEOUT_MS = 150; private static final int TEST_REQUEST_TIMEOUT_MS = 150;
private static final int UNREASONABLY_LONG_ALARM_WAIT_MS = 1000; private static final int UNREASONABLY_LONG_ALARM_WAIT_MS = 2_000;
private static final long TIMESTAMP = 1234L; private static final long TIMESTAMP = 1234L;
@@ -3369,8 +3369,10 @@ public class ConnectivityServiceTest {
// This test would be flaky with the default 120ms timer: that is short enough that // This test would be flaky with the default 120ms timer: that is short enough that
// lingered networks are torn down before assertions can be run. We don't want to mock the // lingered networks are torn down before assertions can be run. We don't want to mock the
// lingering timer to keep the WakeupMessage logic realistic: this has already proven useful // lingering timer to keep the WakeupMessage logic realistic: this has already proven useful
// in detecting races. // in detecting races. Furthermore, sometimes the test is running while Phenotype is running
mService.mLingerDelayMs = 300; // so hot that the test doesn't get the CPU for multiple hundreds of milliseconds, so this
// needs to be suitably long.
mService.mLingerDelayMs = 2_000;
NetworkRequest request = new NetworkRequest.Builder() NetworkRequest request = new NetworkRequest.Builder()
.clearCapabilities().addCapability(NET_CAPABILITY_NOT_METERED) .clearCapabilities().addCapability(NET_CAPABILITY_NOT_METERED)