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

Merge "Fix flake : testVpnSetUnderlyingNetworks" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-07 05:22:20 +00:00
committed by Gerrit Code Review
parent f8732eb2ce 9033477aa7
commit 8ba50ae30f
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9053,6 +9053,18 @@ public class ConnectivityServiceTest {
mCm.registerNetworkCallback(vpnNetworkRequest, vpnNetworkCallback); mCm.registerNetworkCallback(vpnNetworkRequest, vpnNetworkCallback);
vpnNetworkCallback.assertNoCallback(); vpnNetworkCallback.assertNoCallback();
// Lingering timer is short and cell might be disconnected if the device is particularly
// slow running the test, unless it's requested. Make sure the networks the test needs
// are all requested.
final NetworkCallback cellCallback = new NetworkCallback() {};
final NetworkCallback wifiCallback = new NetworkCallback() {};
mCm.requestNetwork(
new NetworkRequest.Builder().addTransportType(TRANSPORT_CELLULAR).build(),
cellCallback);
mCm.requestNetwork(
new NetworkRequest.Builder().addTransportType(TRANSPORT_WIFI).build(),
wifiCallback);
mMockVpn.establishForMyUid(true /* validated */, false /* hasInternet */, mMockVpn.establishForMyUid(true /* validated */, false /* hasInternet */,
false /* privateDnsProbeSent */); false /* privateDnsProbeSent */);
assertUidRangesUpdatedForMyUid(true); assertUidRangesUpdatedForMyUid(true);
@@ -9209,6 +9221,8 @@ public class ConnectivityServiceTest {
assertDefaultNetworkCapabilities(userId /* no networks */); assertDefaultNetworkCapabilities(userId /* no networks */);
mMockVpn.disconnect(); mMockVpn.disconnect();
mCm.unregisterNetworkCallback(cellCallback);
mCm.unregisterNetworkCallback(wifiCallback);
} }
@Test @Test