diff options
| author | Ken Chen <cken@google.com> | 2023-06-28 09:50:47 +0000 |
|---|---|---|
| committer | Ken Chen <cken@google.com> | 2023-06-30 14:37:25 +0800 |
| commit | 3f761f34fcd04fa697e254c396725a027223fe7e (patch) | |
| tree | 88941f34de76ebbc87894498aad8ddca859dbe72 | |
| parent | 44f4ecfe9bdf9ea164976fc1f32c5c15a08b14e7 (diff) | |
| download | DnsResolver-3f761f34fcd04fa697e254c396725a027223fe7e.tar.gz | |
[Test] Deflake GetAddrInfoV4_deferred_resp
Instead of waiting for 100m before launching the second thread, check
the number of queries arrived at dnsresponder to ensure that DNS sent
by the first thread precede DNS sent by the second thread.
Bug: 286832451
Bug: 289220389
Change-Id: I88a9b6525dd4575eb1b1a940794c589b490edfeb
Test: atest --rerun-until-failure=500
resolv_integration_test:ResolverTest#GetAddrInfoV4_deferred_resp
| -rw-r--r-- | tests/resolv_integration_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp index 71f3536d..e4f26fad 100644 --- a/tests/resolv_integration_test.cpp +++ b/tests/resolv_integration_test.cpp @@ -876,7 +876,7 @@ TEST_F(ResolverTest, GetAddrInfoV4_deferred_resp) { }); // ensuring t1 and t2 handler functions are processed in order - usleep(100 * 1000); + EXPECT_TRUE(PollForCondition([&]() { return GetNumQueries(dns1, host_name_deferred); })); std::thread t2([&, this]() { ASSERT_TRUE(mDnsClient.SetResolversFromParcel(ResolverParams::Builder() .setDnsServers(servers_for_t2) |