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

Commit cbc76046 authored by Ken Chen's avatar Ken Chen
Browse files

Add delay to deflake mainline tests 

MdnsIPv6LinkLocalWithDefaultRoute and IPv6LinkLocalWithDefaultRoute are
flaky on APCT mainline testing. The new added route or interface address
somehow does not apply immediately. If the DNS resolver call connect()
right after that, EADDRNOTAVAIL can be returned.

Added a short delay after adding route or interface address to avoid
flaky.

Bug: 247693272
Bug: 252944188
Test: 300 runs on ABTD, all passed
Change-Id: Ie3192aad11bea205ad9bc5611a6a391f35fff4a0
parent 41959e6a

tests/resolv_integration_test.cpp

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

    EXPECT_TRUE(

            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());

    ASSERT_RESULT_OK(result);

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

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

                        .isOk());

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

    usleep(1000 * 1000);



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

    ASSERT_RESULT_OK(dnsPair);