joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "ethernet: skip tests on devices without support" into android13-tests-dev

Browse source
This commit is contained in:
Treehugger Robot 2022-09-15 00:29:48 +00:00 • committed by Gerrit Code Review
commit 175881c63b
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/EthernetManagerTest.kt
View file

@ -64,6 +64,7 @@ import com.android.testutils.runAsShell
import com.android.testutils.waitForIdle
import org.junit.After
import org.junit.Assume.assumeFalse
import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@ -227,15 +228,20 @@ class EthernetManagerTest {
}
}
private fun isEthernetSupported() = em != null
@Before
fun setUp() {
assumeTrue(isEthernetSupported())
setIncludeTestInterfaces(true)
addInterfaceStateListener(ifaceListener)
}
@After
fun tearDown() {
if (!isEthernetSupported()) return
setIncludeTestInterfaces(false)
for (iface in createdIfaces) {
iface.destroy()
ifaceListener.eventuallyExpect(iface, STATE_ABSENT, ROLE_NONE)