From 48ea3b68166c5a0d603262fa07e663d5ec02b0e5 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 12 Oct 2020 17:36:19 +0900 Subject: [PATCH] Do not expect broadcasts in CaptivePortalTest The legacy broadcast may not be sent if wifi does not become the default network within timeout. CaptivePortalTest does not need wifi to be the default network at the start of the test, as it will be disconnected/reconnected immediately after anyway. Bug: 169106352 Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest Change-Id: Ie4ee6b3c3ed7c0d414fd3cc162d4183248120895 --- tests/cts/net/src/android/net/cts/CaptivePortalTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt b/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt index 12a966fd31..f24053c0fe 100644 --- a/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt +++ b/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt @@ -123,7 +123,7 @@ class CaptivePortalTest { fun testCaptivePortalIsNotDefaultNetwork() { assumeTrue(pm.hasSystemFeature(FEATURE_TELEPHONY)) assumeTrue(pm.hasSystemFeature(FEATURE_WIFI)) - utils.connectToWifi() + utils.ensureWifiConnected() utils.connectToCell() // Have network validation use a local server that serves a HTTPS error / HTTP redirect