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

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

Change-Id: I757578de37ed392e64caa895acf3e8704fb16dd9
This commit is contained in:
Treehugger Robot
2020-10-14 12:28:44 +00:00
committed by Automerger Merge Worker

View File

@@ -123,7 +123,7 @@ class CaptivePortalTest {
fun testCaptivePortalIsNotDefaultNetwork() { fun testCaptivePortalIsNotDefaultNetwork() {
assumeTrue(pm.hasSystemFeature(FEATURE_TELEPHONY)) assumeTrue(pm.hasSystemFeature(FEATURE_TELEPHONY))
assumeTrue(pm.hasSystemFeature(FEATURE_WIFI)) assumeTrue(pm.hasSystemFeature(FEATURE_WIFI))
utils.connectToWifi() utils.ensureWifiConnected()
utils.connectToCell() utils.connectToCell()
// Have network validation use a local server that serves a HTTPS error / HTTP redirect // Have network validation use a local server that serves a HTTPS error / HTTP redirect