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

Merge "Fix testSetOemNetworkPreferenceForTestOnlyPref flaky" into main

Browse Source
This commit is contained in:
Mark Chien
2023-08-15 08:20:15 +00:00
committed by Gerrit Code Review
parent 29d3ea96f3 113e5a977a
commit 3a8ed26686
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -2757,17 +2757,19 @@ public class ConnectivityManagerTest {
final TestableNetworkCallback systemDefaultCallback = new TestableNetworkCallback(); final TestableNetworkCallback systemDefaultCallback = new TestableNetworkCallback();
final Network wifiNetwork = mCtsNetUtils.ensureWifiConnected(); final Network wifiNetwork = mCtsNetUtils.ensureWifiConnected();
final Network testNetwork = tnt.getNetwork();
testAndCleanup(() -> { testAndCleanup(() -> {
setOemNetworkPreferenceForMyPackage( setOemNetworkPreferenceForMyPackage(
OemNetworkPreferences.OEM_NETWORK_PREFERENCE_TEST_ONLY); OemNetworkPreferences.OEM_NETWORK_PREFERENCE_TEST_ONLY);
registerTestOemNetworkPreferenceCallbacks(defaultCallback, systemDefaultCallback); registerTestOemNetworkPreferenceCallbacks(defaultCallback, systemDefaultCallback);
waitForAvailable(defaultCallback, tnt.getNetwork()); waitForAvailable(defaultCallback, testNetwork);
systemDefaultCallback.eventuallyExpect(CallbackEntry.AVAILABLE, systemDefaultCallback.eventuallyExpect(CallbackEntry.AVAILABLE,
NETWORK_CALLBACK_TIMEOUT_MS, cb -> wifiNetwork.equals(cb.getNetwork())); NETWORK_CALLBACK_TIMEOUT_MS, cb -> wifiNetwork.equals(cb.getNetwork()));
}, /* cleanup */ () -> { }, /* cleanup */ () -> {
runWithShellPermissionIdentity(tnt::teardown); runWithShellPermissionIdentity(tnt::teardown);
defaultCallback.expect(CallbackEntry.LOST, tnt, NETWORK_CALLBACK_TIMEOUT_MS); defaultCallback.eventuallyExpect(CallbackEntry.LOST, NETWORK_CALLBACK_TIMEOUT_MS,
cb -> testNetwork.equals(cb.getNetwork()));
// This network preference should only ever use the test network therefore available // This network preference should only ever use the test network therefore available
// should not trigger when the test network goes down (e.g. switch to cellular). // should not trigger when the test network goes down (e.g. switch to cellular).