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

Commit 6a87d571 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Merge "Add delay to deflake mainline tests" am: d3d64202 

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



Change-Id: I4b51879b632ce26250a8d3eb30dc11a29186fbd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96364e26 d3d64202

tests/resolv_integration_test.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -7580,6 +7580,9 @@ TEST_F(ResolverMultinetworkTest, IPv6LinkLocalWithDefaultRoute) { 
    const std::string v6Addr = network.makeIpv6AddrString(1);

    const std::string v6Addr = network.makeIpv6AddrString(1);

    EXPECT_TRUE(

    EXPECT_TRUE(

            mDnsClient.netdService()->interfaceAddAddress(network.ifname(), v6Addr, 128).isOk());

            mDnsClient.netdService()->interfaceAddAddress(network.ifname(), v6Addr, 128).isOk());

    // Ensuring that address is applied. This is required for mainline test (b/249225311).

    usleep(1000 * 1000);



    result = android_getaddrinfofornet_wrapper(host_name, network.netId());

    result = android_getaddrinfofornet_wrapper(host_name, network.netId());

    ASSERT_RESULT_OK(result);

    ASSERT_RESULT_OK(result);

    ScopedAddrinfo ai_results(std::move(result.value()));

    ScopedAddrinfo ai_results(std::move(result.value()));
@@ -7608,6 +7611,8 @@ TEST_F(ResolverMultinetworkTest, MdnsIPv6LinkLocalWithDefaultRoute) { 
    ASSERT_TRUE(mDnsClient.netdService()

    ASSERT_TRUE(mDnsClient.netdService()

                        ->networkAddRoute(network.netId(), network.ifname(), "::/0", "")

                        ->networkAddRoute(network.netId(), network.ifname(), "::/0", "")

                        .isOk());

                        .isOk());

    // Ensuring that routing is applied. This is required for mainline test (b/247693272).

    usleep(1000 * 1000);





    const Result<DnsServerPair> dnsPair = network.addIpv4Dns();

    const Result<DnsServerPair> dnsPair = network.addIpv4Dns();

    ASSERT_RESULT_OK(dnsPair);

    ASSERT_RESULT_OK(dnsPair);