From b68f4ace76ebafedfa229b3758b61a393ecf25d0 Mon Sep 17 00:00:00 2001 From: Handa Wang Date: Wed, 26 Feb 2025 01:16:41 -0800 Subject: [PATCH] [Thread] In Integration test, let the DNS client wait for DNS server to show up in Network Data The bring up delay of SRP server is higher than before. In the integration test case we need to explicitly wait for the SRP server to show up in Network Data. Otherwise the test may be flaky. Bug: 399263029 Change-Id: Id6346bcbfd55a34103ba8de0dcee75d3cacde446 --- .../integration/src/android/net/thread/InternetAccessTest.kt | 4 ++++ .../src/android/net/thread/utils/FullThreadDevice.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/thread/tests/integration/src/android/net/thread/InternetAccessTest.kt b/thread/tests/integration/src/android/net/thread/InternetAccessTest.kt index 3c9aa0725b..46d4708de9 100644 --- a/thread/tests/integration/src/android/net/thread/InternetAccessTest.kt +++ b/thread/tests/integration/src/android/net/thread/InternetAccessTest.kt @@ -167,6 +167,8 @@ class InternetAccessTest { val ftd = ftds[0] joinNetworkAndWaitForOmr(ftd, DEFAULT_DATASET) dnsServer.start() + ftd.autoStartSrpClient() + ftd.waitForSrpServer() val ipv4Addresses = ftd.resolveHost("google.com", TYPE_A).map { extractIpv4AddressFromMappedAddress(it) } @@ -181,6 +183,8 @@ class InternetAccessTest { val ftd = ftds[0] joinNetworkAndWaitForOmr(ftd, DEFAULT_DATASET) dnsServer.start() + ftd.autoStartSrpClient() + ftd.waitForSrpServer() assertThat(ftd.resolveHost("google.com", TYPE_A)).isEmpty() assertThat(ftd.resolveHost("google.com", TYPE_AAAA)).isEmpty() diff --git a/thread/tests/integration/src/android/net/thread/utils/FullThreadDevice.java b/thread/tests/integration/src/android/net/thread/utils/FullThreadDevice.java index 209eed647b..38961a33b4 100644 --- a/thread/tests/integration/src/android/net/thread/utils/FullThreadDevice.java +++ b/thread/tests/integration/src/android/net/thread/utils/FullThreadDevice.java @@ -521,7 +521,7 @@ public final class FullThreadDevice { } /** Waits for an SRP server to be present in Network Data */ - private void waitForSrpServer() throws TimeoutException { + public void waitForSrpServer() throws TimeoutException { // CLI output: // > srp client server // [fd64:db12:25f4:7e0b:1bfc:6344:25ac:2dd7]:53538