commit 4d5e98e41c71cff78328b6c3a6d972935ab6631d
author Mark <markchien@google.com> Mon Jul 03 09:23:55 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Aug 02 09:44:19 2023 +0000
tree ce3e3423cdd8b140c93238e2f8ffa12b33932aef
parent 846032e9455640b534a57ab0175c81d951b35fdf

Don't run EthernetTetheringTest if Ethernet is not supported

Bug: 288844185
Test: atest CtsTetheringTest
(cherry picked from https://android-review.googlesource.com/q/commit:dc581e6c8ff1a5b956ba41b2eb1fcdc7a11e1e65)
Merged-In: Ie918a0657ab17900437918f7ae99f7aa2539052c
Change-Id: Ie918a0657ab17900437918f7ae99f7aa2539052c

Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java

diff --git a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
index 007bf23..dfb4aa5 100644
--- a/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
+++ b/Tethering/tests/integration/base/android/net/EthernetTetheringTestBase.java
@@ -184,13 +184,18 @@
         mHandlerThread.start();
         mHandler = new Handler(mHandlerThread.getLooper());
 
-        mRunTests = runAsShell(NETWORK_SETTINGS, TETHER_PRIVILEGED, () ->
-                mTm.isTetheringSupported());
+        mRunTests = isEthernetTetheringSupported();
         assumeTrue(mRunTests);
 
         mTetheredInterfaceRequester = new TetheredInterfaceRequester(mHandler, mEm);
     }
 
+    private boolean isEthernetTetheringSupported() throws Exception {
+        if (mEm == null) return false;
+
+        return runAsShell(NETWORK_SETTINGS, TETHER_PRIVILEGED, () -> mTm.isTetheringSupported());
+    }
+
     protected void maybeStopTapPacketReader(final TapPacketReader tapPacketReader)
             throws Exception {
         if (tapPacketReader != null) {