From e23bb41c737ac2baad0a2b95b945e9f7c8b30409 Mon Sep 17 00:00:00 2001 From: Yang Sun Date: Thu, 29 Feb 2024 11:15:47 +0800 Subject: [PATCH] Fix flaky multicast tests in Thread E2E test. Bug: 327526332 Test: atest ThreadNetworkIntegrationTests:android.net.thread.BorderRoutingTest --iterations 10 Change-Id: I70f968e737e8540a27b8ce7c03dc0e3e1bf26b56 --- .../src/android/net/thread/BorderRoutingTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/thread/tests/integration/src/android/net/thread/BorderRoutingTest.java b/thread/tests/integration/src/android/net/thread/BorderRoutingTest.java index 7aaae869c2..e8ef3463ff 100644 --- a/thread/tests/integration/src/android/net/thread/BorderRoutingTest.java +++ b/thread/tests/integration/src/android/net/thread/BorderRoutingTest.java @@ -374,9 +374,13 @@ public class BorderRoutingTest { subscribeMulticastAddressAndWait(ftd2, GROUP_ADDR_SCOPE_4); mInfraDevice.sendEchoRequest(GROUP_ADDR_SCOPE_5); - mInfraDevice.sendEchoRequest(GROUP_ADDR_SCOPE_4); assertNotNull(pollForPacketOnInfraNetwork(ICMPV6_ECHO_REPLY_TYPE, ftd1.getOmrAddress())); + + // Verify ping reply from ftd1 and ftd2 separately as the order of replies can't be + // predicted. + mInfraDevice.sendEchoRequest(GROUP_ADDR_SCOPE_4); + assertNotNull(pollForPacketOnInfraNetwork(ICMPV6_ECHO_REPLY_TYPE, ftd2.getOmrAddress())); } @@ -405,11 +409,13 @@ public class BorderRoutingTest { startFtdChild(ftd2); subscribeMulticastAddressAndWait(ftd2, GROUP_ADDR_SCOPE_5); - // Send the request twice as the order of replies from ftd1 and ftd2 are not guaranteed - mInfraDevice.sendEchoRequest(GROUP_ADDR_SCOPE_5); mInfraDevice.sendEchoRequest(GROUP_ADDR_SCOPE_5); assertNotNull(pollForPacketOnInfraNetwork(ICMPV6_ECHO_REPLY_TYPE, ftd1.getOmrAddress())); + + // Send the request twice as the order of replies from ftd1 and ftd2 are not guaranteed + mInfraDevice.sendEchoRequest(GROUP_ADDR_SCOPE_5); + assertNotNull(pollForPacketOnInfraNetwork(ICMPV6_ECHO_REPLY_TYPE, ftd2.getOmrAddress())); }