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

Commit 34f6e8bd authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Fix flaky tests due to onDnsEvent am: b8faac42 am: d6adfe07 

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

Change-Id: I846c938c230364d0aa62b4a086ab54cd5b65a9f5
parents c64fc4ba d6adfe07

tests/resolv_integration_test.cpp

+7 −3
Original line number Diff line number Diff line
@@ -237,9 +237,13 @@ class ResolverTest : public ::testing::Test { 
        const DnsMetricsListener::DnsEvent expect = {

                TEST_NETID, eventType,   returnCode,

                hostname,   ipAddresses, static_cast<int32_t>(ipAddresses.size())};

        do {

            // Blocking call until timeout.

            const auto dnsEvent = sDnsMetricsListener->popDnsEvent();

        ASSERT_TRUE(dnsEvent.has_value());

        EXPECT_EQ(dnsEvent.value(), expect);

            ASSERT_TRUE(dnsEvent.has_value()) << "Expected DnsEvent " << expect;

            if (dnsEvent.value() == expect) break;

            LOG(INFO) << "Skip unexpected DnsEvent: " << dnsEvent.value();

        } while (true);

    }



    bool expectStatsFromGetResolverInfo(const std::vector<NameserverStats>& nameserversStats) {