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

Merge "Fix EthernetTetheringTest#testLocalOnlyTethering flaky" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-09-14 17:40:06 +00:00
committed by Gerrit Code Review
parent c3a188d7dc 801079f25a
commit 47158c98b5
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); waitForRouterAdvertisement(downstreamReader, iface, WAIT_RA_TIMEOUT_MS);
expectLocalOnlyAddresses(iface); 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 { } finally {
maybeStopTapPacketReader(downstreamReader); maybeStopTapPacketReader(downstreamReader);
maybeCloseTestInterface(downstreamIface); maybeCloseTestInterface(downstreamIface);