From 9c9c600c16bc4fa6f5794e98e91d07154e592541 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Thu, 28 May 2020 08:50:08 +0000 Subject: [PATCH] Extend timeout for requesting tethered interface Extend the timeout to lower the EthernetTetheringTest flaky. Besides, also explicitly exempt entitlement check in EtetherntTetheringTest because it do not test tethering upstream currently. Thus, the tests would not be interrupted by entitlement check if test SIM is entitlement required. Bug: 156713866 Test: TetheringCoverageTests, CtsTehteringTest Merged-In: I45e8e8d737486def9d0de8943ec7f09ca0942a0b Change-Id: I45e8e8d737486def9d0de8943ec7f09ca0942a0b --- .../src/android/net/EthernetTetheringTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java index 4bac9da9c3..2fb7e607d0 100644 --- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java +++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java @@ -76,7 +76,7 @@ import java.util.concurrent.TimeoutException; public class EthernetTetheringTest { private static final String TAG = EthernetTetheringTest.class.getSimpleName(); - private static final int TIMEOUT_MS = 1000; + private static final int TIMEOUT_MS = 5000; private static final int PACKET_READ_TIMEOUT_MS = 100; private static final int DHCP_DISCOVER_ATTEMPTS = 10; private static final byte[] DHCP_REQUESTED_PARAMS = new byte[] { @@ -338,7 +338,8 @@ public class EthernetTetheringTest { private MyTetheringEventCallback enableEthernetTethering(String iface) throws Exception { return enableEthernetTethering(iface, - new TetheringRequest.Builder(TETHERING_ETHERNET).build()); + new TetheringRequest.Builder(TETHERING_ETHERNET) + .setExemptFromEntitlementCheck(true).build()); } private int getMTU(TestNetworkInterface iface) throws SocketException { @@ -508,7 +509,8 @@ public class EthernetTetheringTest { LinkAddress localAddr = local == null ? null : new LinkAddress(local); LinkAddress clientAddr = client == null ? null : new LinkAddress(client); return new TetheringRequest.Builder(TETHERING_ETHERNET) - .setStaticIpv4Addresses(localAddr, clientAddr).build(); + .setStaticIpv4Addresses(localAddr, clientAddr) + .setExemptFromEntitlementCheck(true).build(); } private void assertInvalidStaticIpv4Request(String iface, String local, String client)