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

Commit 78f48c31 authored by Mike Yu's avatar Mike Yu
Browse files

Fix flaky test PrivateDnsDohTest.PreferIpv6

doh_ipv6.startServer() fails at binding the address if the address
hasn't been released. Change the test to bind the address once only.

Bug: 198111329
Test: PrivateDnsDohTest.ValidationFail 500 times passed on cuttlefish
Change-Id: I6b347528927ec3afc7eddfa31784c1f34e4e7661
parent 03e4903f
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -422,16 +422,16 @@ TEST_F(PrivateDnsDohTest, PreferIpv6) {
    // To simplify the test, set the DoT server broken.
    dot.stopServer();

    for (const auto& serverList : testConfig) {
        SCOPED_TRACE(fmt::format("serverList: [{}]", fmt::join(serverList, ", ")));
    test::DNSResponder dns_ipv6{listen_ipv6_addr, "53"};
    test::DohFrontend doh_ipv6{listen_ipv6_addr, "443", listen_ipv6_addr, "53"};

    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_a, kQueryAnswerA);
    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_aaaa, kQueryAnswerAAAA);
    ASSERT_TRUE(dns_ipv6.startServer());
    ASSERT_TRUE(doh_ipv6.startServer());

    for (const auto& serverList : testConfig) {
        SCOPED_TRACE(fmt::format("serverList: [{}]", fmt::join(serverList, ", ")));

        auto parcel = DnsResponderClient::GetDefaultResolverParamsParcel();
        parcel.servers = serverList;
        parcel.tlsServers = serverList;