From ecad16cf28a187914733df4cc2d69874563e9cec Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Wed, 9 Jun 2021 18:42:59 +0000 Subject: [PATCH] Skip CaptivePortalTest for wearables Watch devices do not support Captive Portal connection Bug: 189540750 Original-Change: https://android-review.googlesource.com/1727591 Merged-In: Iaf1a799d0cda1d7156fedcdab34184a52f351fbf Change-Id: Iaf1a799d0cda1d7156fedcdab34184a52f351fbf Test: run cts -m CtsNetTestCases -t android.net.cts.CaptivePortalTest#testCaptivePortalIsNotDefaultNetwork --- tests/cts/net/src/android/net/cts/CaptivePortalTest.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt b/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt index a889c41f53..f993aedd1f 100644 --- a/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt +++ b/tests/cts/net/src/android/net/cts/CaptivePortalTest.kt @@ -20,6 +20,7 @@ import android.Manifest.permission.CONNECTIVITY_INTERNAL import android.Manifest.permission.NETWORK_SETTINGS import android.Manifest.permission.READ_DEVICE_CONFIG import android.content.pm.PackageManager.FEATURE_TELEPHONY +import android.content.pm.PackageManager.FEATURE_WATCH import android.content.pm.PackageManager.FEATURE_WIFI import android.net.ConnectivityManager import android.net.ConnectivityManager.NetworkCallback @@ -57,6 +58,7 @@ import fi.iki.elonen.NanoHTTPD.Response.Status import junit.framework.AssertionFailedError import org.junit.After import org.junit.Assume.assumeTrue +import org.junit.Assume.assumeFalse import org.junit.Before import org.junit.runner.RunWith import java.util.concurrent.CompletableFuture @@ -128,6 +130,7 @@ class CaptivePortalTest { fun testCaptivePortalIsNotDefaultNetwork() { assumeTrue(pm.hasSystemFeature(FEATURE_TELEPHONY)) assumeTrue(pm.hasSystemFeature(FEATURE_WIFI)) + assumeFalse(pm.hasSystemFeature(FEATURE_WATCH)) utils.ensureWifiConnected() val cellNetwork = utils.connectToCell()