From bfeb1580a7c21f787ecb6ebb7b87a8112eaf4713 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 29 Jul 2022 08:21:35 -0700 Subject: [PATCH] ethernet: skip tests on devices without support Test: atest EthernetManagerTest Bug: 239521025 Change-Id: Ie39cc371315899ead8c6991ef8d5e8b95cc0e3a8 Merged-In: Ie39cc371315899ead8c6991ef8d5e8b95cc0e3a8 --- tests/cts/net/src/android/net/cts/EthernetManagerTest.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt index db24b4493b..8b5774c225 100644 --- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt +++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt @@ -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)