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

Commit 37de0d69 authored by Mike Yu's avatar Mike Yu
Browse files

Fix TlsServerRevalidation flaky 

The test becomes flaky because tls.clearQueries() is called without
tls.waitForQueries(). A recent change has made DnsTlsFrontend take
extra 50 ms to wait for another query from DoT validation, the test
will fail if tls.clearQueries() is called while DnsTlsFrontend is
still waiting for the query.

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

Bug: 188153519
Bug: 191147599
Test: resolv_integration_test64 --gtest_filter="*TlsServerRevalidation"
      --gtest_repeat=100 --gtest_break_on_failure
Change-Id: Ieb81a407c2a9c6aa119ab4499a93a9ffd663b716
Merged-In: Ieb81a407c2a9c6aa119ab4499a93a9ffd663b716
parent 59cd583e

tests/resolv_integration_test.cpp

+17 −7
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ using aidl::android::net::resolv::aidl::IDnsResolverUnsolicitedEventListener; 
using aidl::android::net::resolv::aidl::Nat64PrefixEventParcel;

using aidl::android::net::resolv::aidl::PrivateDnsValidationEventParcel;

using android::base::Error;

using android::base::GetProperty;

using android::base::ParseInt;

using android::base::Result;

using android::base::StringPrintf;
@@ -4688,6 +4689,13 @@ TEST_F(ResolverTest, TlsServerRevalidation) { 
        ScopedSystemProperties sp3(kDotQueryTimeoutMsFlag, std::to_string(dotQueryTimeoutMs));

        resetNetwork();



        // This test is sensitive to the number of queries sent in DoT validation.

        const int latencyFactor = std::stoi(GetProperty(kDotValidationLatencyFactorFlag, "-1"));

        const int latencyOffsetMs = std::stoi(GetProperty(kDotValidationLatencyOffsetMsFlag, "-1"));

        const bool dotValidationExtraProbes = (config.dnsMode == "OPPORTUNISTIC") &&

                                              (latencyFactor >= 0 && latencyOffsetMs >= 0 &&

                                               latencyFactor + latencyOffsetMs != 0);



        const std::string addr = getUniqueIPv4Address();

        test::DNSResponder dns(addr);

        StartDns(dns, records);
@@ -4700,6 +4708,11 @@ TEST_F(ResolverTest, TlsServerRevalidation) { 
        if (config.dnsMode == "STRICT") parcel.tlsName = kDefaultPrivateDnsHostName;

        ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));

        EXPECT_TRUE(WaitForPrivateDnsValidation(tls.listen_address(), true));

        if (dotValidationExtraProbes) {

            EXPECT_TRUE(tls.waitForQueries(2));

        } else {

            EXPECT_TRUE(tls.waitForQueries(1));

        }

        tls.clearQueries();

        dns.clearQueries();
@@ -4746,13 +4759,6 @@ TEST_F(ResolverTest, TlsServerRevalidation) { 
            EXPECT_TRUE(WaitForPrivateDnsValidation(tls.listen_address(), true));

            expectedDotQueries++;



            // This test is sensitive to the number of queries sent in DoT validation.

            const std::string latencyFactor =

                    android::base::GetProperty(kDotValidationLatencyFactorFlag, "-1");

            const std::string latencyOffsetMs =

                    android::base::GetProperty(kDotValidationLatencyOffsetMsFlag, "-1");

            const bool dotValidationExtraProbes =

                    (latencyFactor != "-1" && latencyOffsetMs != "-1");

            if (dotValidationExtraProbes) {

                expectedDotQueries++;

                extraDnsProbe = 1;
@@ -4773,6 +4779,10 @@ TEST_F(ResolverTest, TlsServerRevalidation) { 
            // the DnsResolver doesn't use the DoT server for a certain period of time.

            expectedDotQueries--;

        }



        // This code makes the test more robust to race condition.

        EXPECT_TRUE(tls.waitForQueries(expectedDotQueries));



        EXPECT_EQ(dns.queries().size(), static_cast<unsigned>(expectedDo53Queries));

        EXPECT_EQ(tls.queries(), expectedDotQueries);

    }