commit b68d322521f9a0fb851486fe0b6fd8d7462bf05b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 08 04:41:34 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 08 04:41:34 2020 +0000
tree efaf206c59403cf24403d12de322f5af0fd67664
parent 6b66d70ba198054a4172e34703d201776185069c
parent 37ad92e0580ce20ba6e56e9724cdb3bf3282f0e7

Merge "Skip testPhysicalEthernet if the test run adb over network"

Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
index 74df113..e10bab4 100644
--- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
+++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
@@ -42,6 +42,7 @@
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.system.Os;
 import android.util.Log;
 
@@ -224,9 +225,19 @@
 
     }
 
+    private boolean isAdbOverNetwork() {
+        // If adb TCP port opened, this test may running by adb over network.
+        return (SystemProperties.getInt("persist.adb.tcp.port", -1) > -1)
+                || (SystemProperties.getInt("service.adb.tcp.port", -1) > -1);
+    }
+
     @Test
     public void testPhysicalEthernet() throws Exception {
         assumeTrue(mEm.isAvailable());
+        // Do not run this test if adb is over network and ethernet is connected.
+        // It is likely the adb run over ethernet, the adb would break when ethernet is switching
+        // from client mode to server mode. See b/160389275.
+        assumeFalse(isAdbOverNetwork());
 
         // Get an interface to use.
         final String iface = mTetheredInterfaceRequester.getInterface();