LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Run validation tests even with an eth interface" am: 856ad3bc23 am: 5e759307ff am: 865b91be43 am: 35f42b2205

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/cts/+/1400131

Change-Id: I04c936cb316636fb0bb7cf59fb8b5142652bd363
This commit is contained in:
Treehugger Robot
2020-08-24 11:28:30 +00:00
committed by Automerger Merge Worker
parent ae4f8b0103 35f42b2205
commit 26bf4e3fe3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/cts/net/src/android/net/cts/NetworkValidationTest.kt
View File

@@ -19,12 +19,14 @@ package android.net.cts
import android.Manifest.permission.MANAGE_TEST_NETWORKS import android.Manifest.permission.MANAGE_TEST_NETWORKS
import android.Manifest.permission.NETWORK_SETTINGS import android.Manifest.permission.NETWORK_SETTINGS
import android.content.Context import android.content.Context
import android.content.pm.PackageManager
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.EthernetManager import android.net.EthernetManager
import android.net.InetAddresses import android.net.InetAddresses
import android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL import android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
import android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED import android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED
import android.net.NetworkCapabilities.TRANSPORT_ETHERNET import android.net.NetworkCapabilities.TRANSPORT_ETHERNET
import android.net.NetworkCapabilities.TRANSPORT_TEST
import android.net.NetworkRequest import android.net.NetworkRequest
import android.net.TestNetworkInterface import android.net.TestNetworkInterface
import android.net.TestNetworkManager import android.net.TestNetworkManager
@@ -55,6 +57,7 @@ import com.android.testutils.TestableNetworkCallback
import fi.iki.elonen.NanoHTTPD.Response.Status import fi.iki.elonen.NanoHTTPD.Response.Status
import org.junit.After import org.junit.After
import org.junit.Assume.assumeFalse import org.junit.Assume.assumeFalse
import org.junit.Assume.assumeTrue
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
@@ -95,7 +98,8 @@ class NetworkValidationTest {
private val ethRequest = NetworkRequest.Builder() private val ethRequest = NetworkRequest.Builder()
// ETHERNET|TEST transport networks do not have NET_CAPABILITY_TRUSTED // ETHERNET|TEST transport networks do not have NET_CAPABILITY_TRUSTED
.removeCapability(NET_CAPABILITY_TRUSTED) .removeCapability(NET_CAPABILITY_TRUSTED)
.addTransportType(TRANSPORT_ETHERNET).build() .addTransportType(TRANSPORT_ETHERNET)
.addTransportType(TRANSPORT_TEST).build()
private val ethRequestCb = TestableNetworkCallback() private val ethRequestCb = TestableNetworkCallback()
private lateinit var iface: TestNetworkInterface private lateinit var iface: TestNetworkInterface
@@ -106,9 +110,10 @@ class NetworkValidationTest {
@Before @Before
fun setUp() { fun setUp() {
// This test requires using a tap interface as the default ethernet interface: skip if there // This test requires using a tap interface as an ethernet interface.
// is already an ethernet interface connected. val pm = context.getPackageManager()
testSkipped = eth.isAvailable() testSkipped = !pm.hasSystemFeature(PackageManager.FEATURE_ETHERNET) &&
context.getSystemService(EthernetManager::class.java) == null
assumeFalse(testSkipped) assumeFalse(testSkipped)
// Register a request so the network does not get torn down // Register a request so the network does not get torn down