Merge "Do not expect broadcasts in CaptivePortalTest" am: b54ca7b0c3 am: 6d893b3eb3 am: 41de3755e9

Original change: https://android-review.googlesource.com/c/platform/cts/+/1459764

Change-Id: I13e1b361c554907284d776e4b4c1a82349efba1b
This commit is contained in:
Treehugger Robot
2020-10-14 13:18:15 +00:00
committed by Automerger Merge Worker

View File

@@ -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