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

Commit 94afd9e3 authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Merge "Fix flaky test RepeatedSetup_KeepChangingPrivateDnsServers" am: fe5b82ec 

Change-Id: If6a5a4143da78daf49f4ac70f06b0c03b21c320b
parents 9597f96c fe5b82ec

tests/resolv_integration_test.cpp

+6 −0
Original line number Diff line number Diff line
@@ -4355,6 +4355,11 @@ TEST_F(ResolverTest, RepeatedSetup_KeepChangingPrivateDnsServers) { 
    enum TlsServerState { WORKING, UNSUPPORTED, UNRESPONSIVE };

    const std::string addr1 = getUniqueIPv4Address();

    const std::string addr2 = getUniqueIPv4Address();

    const auto waitForPrivateDnsStateUpdated = []() {

        // A buffer time for PrivateDnsConfiguration to update its state. It prevents this test

        // being flaky. See b/152009023 for the reason.

        std::this_thread::sleep_for(20ms);

    };



    test::DNSResponder dns1(addr1);

    test::DNSResponder dns2(addr2);
@@ -4408,6 +4413,7 @@ TEST_F(ResolverTest, RepeatedSetup_KeepChangingPrivateDnsServers) { 
            tls.setHangOnHandshakeForTesting(serverState == UNRESPONSIVE);

            const int connectCountsBefore = tls.acceptConnectionsCount();



            waitForPrivateDnsStateUpdated();

            ResolverParamsParcel parcel = DnsResponderClient::GetDefaultResolverParamsParcel();

            parcel.servers = {config.tlsServer};

            parcel.tlsServers = {config.tlsServer};