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

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

Browse Source
This commit is contained in:
Treehugger Robot
2020-07-08 04:41:34 +00:00
committed by Gerrit Code Review
parent 6b66d70ba1 37ad92e058
commit b68d322521
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

@@ -42,6 +42,7 @@ import android.net.dhcp.DhcpPacket;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties;
import android.system.Os; import android.system.Os;
import android.util.Log; import android.util.Log;
@@ -224,9 +225,19 @@ public class EthernetTetheringTest {
} }
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 @Test
public void testPhysicalEthernet() throws Exception { public void testPhysicalEthernet() throws Exception {
assumeTrue(mEm.isAvailable()); 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. // Get an interface to use.
final String iface = mTetheredInterfaceRequester.getInterface(); final String iface = mTetheredInterfaceRequester.getInterface();