Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7659270f authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

[Test] Deflake ResolverTest#GetAddrInfoV4_deferred_resp am: 70a5dab7 am: d9ecf3df 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2785008



Change-Id: I74f55a821223bf65cdf4ea4370875d08bbfaecb2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b6a8e56 d9ecf3df

tests/resolv_integration_test.cpp

+3 −1
Original line number Diff line number Diff line
@@ -860,6 +860,7 @@ TEST_F(ResolverTest, GetAddrInfoV4_deferred_resp) { 
    addrinfo hints = {.ai_family = AF_INET};

    const std::array<int, IDnsResolver::RESOLVER_PARAMS_COUNT> params = {300, 25, 8, 8, 5000, 0};

    bool t3_task_done = false;

    bool t2_sv_setup_done = false;



    dns1.setDeferredResp(true);

    std::thread t1([&, this]() {
@@ -884,6 +885,7 @@ TEST_F(ResolverTest, GetAddrInfoV4_deferred_resp) { 
                                                              .setDotServers({})

                                                              .setParams(params)

                                                              .build()));

        t2_sv_setup_done = true;

        ScopedAddrinfo result = safe_getaddrinfo(host_name_deferred, nullptr, &hints);

        EXPECT_TRUE(t3_task_done);

        EXPECT_EQ(0U, GetNumQueries(dns2, host_name_deferred));
@@ -895,7 +897,7 @@ TEST_F(ResolverTest, GetAddrInfoV4_deferred_resp) { 
    });



    // ensuring t2 and t3 handler functions are processed in order

    usleep(100 * 1000);

    EXPECT_TRUE(PollForCondition([&]() { return t2_sv_setup_done; }));

    std::thread t3([&, this]() {

        ASSERT_TRUE(mDnsClient.SetResolversFromParcel(ResolverParams::Builder()

                                                              .setDnsServers(servers_for_t3)