From 29021f0c643f4827676618a4b936db60346ba494 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 24 Sep 2020 10:27:28 +0000 Subject: [PATCH] Don't check broadcast intent on connection status check testRequestNetworkCallback_onUnavailable is flaky because the test expects a connectivity broadcast to be sent for the lost network. But after testSetAirplaneMode, the wifi network is not yet default network so a broadcast is never sent but only onUnavailable is triggered. Replace disconnectFromWifi with ensureWifiDisconnected to skip checking the broadcast. Bug: 162323152 Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest\ --rerun-until-failure 20 Original-Change: https://android-review.googlesource.com/1435534 Merged-In: I88f434798ec83539df9cc6a81446ca37a0081e3b Change-Id: I88f434798ec83539df9cc6a81446ca37a0081e3b --- tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 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 3880664827..1961e3da20 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -592,7 +592,7 @@ public class ConnectivityManagerTest { public void testRequestNetworkCallback_onUnavailable() { final boolean previousWifiEnabledState = mWifiManager.isWifiEnabled(); if (previousWifiEnabledState) { - mCtsNetUtils.disconnectFromWifi(null); + mCtsNetUtils.ensureWifiDisconnected(null); } final TestNetworkCallback callback = new TestNetworkCallback();