From 79adff3ae7eac059ca0be46bc688f868ae41c86e Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Tue, 26 Sep 2023 14:50:07 +0900 Subject: [PATCH] Fix testSetOemNetworkPreferenceForTestPref flake The issue seems to be that some other network may become available or change capabilities before Lost happens, as can be the case with real networks like in CTS. Test: TH Bug: 289879931 Change-Id: I849f3b7d99f5d5195a3bbd3c39720923597a51d9 --- tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 59aefa5e84..d2c9481728 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -2723,7 +2723,8 @@ public class ConnectivityManagerTest { // the network with the TEST transport. Also wait for validation here, in case there // is a bug that's only visible when the network is validated. setWifiMeteredStatusAndWait(ssid, true /* isMetered */, true /* waitForValidation */); - defaultCallback.expect(CallbackEntry.LOST, wifiNetwork, NETWORK_CALLBACK_TIMEOUT_MS); + defaultCallback.eventuallyExpect(CallbackEntry.LOST, NETWORK_CALLBACK_TIMEOUT_MS, + l -> l.getNetwork().equals(wifiNetwork)); waitForAvailable(defaultCallback, tnt.getNetwork()); // Depending on if this device has cellular connectivity or not, multiple available // callbacks may be received. Eventually, metered Wi-Fi should be the final available