joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main am: 47158c98b5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2676841

Change-Id: Iffe892336e49b68f69b14aca140345983abeb3bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-14 18:07:58 +00:00 • committed by Automerger Merge Worker
commit b41a17a4f4
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View file

@ -326,6 +326,14 @@ public class EthernetTetheringTest extends EthernetTetheringTestBase {
waitForRouterAdvertisement(downstreamReader, iface, WAIT_RA_TIMEOUT_MS);
expectLocalOnlyAddresses(iface);
// After testing the IPv6 local address, the DHCP server may still be in the process
// of being created. If the downstream interface is killed by the test while the
// DHCP server is starting, a DHCP server error may occur. To ensure that the DHCP
// server has started completely before finishing the test, also test the dhcp server
// by calling runDhcp.
final TetheringTester tester = new TetheringTester(downstreamReader);
tester.runDhcp(MacAddress.fromString("1:2:3:4:5:6").toByteArray());
} finally {
maybeStopTapPacketReader(downstreamReader);
maybeCloseTestInterface(downstreamIface);