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

Commit b8faac42 authored by Mike Yu's avatar Mike Yu
Browse files

Fix flaky tests due to onDnsEvent 

Since not every test checks onDnsEvent, a test might receive a
DnsEvent which should have been catched by the previous test.

Modify ExpectDnsEvent() to drop unexpected DnsEvents until the
target DnsEvent is found.

Bug: 159439402
Test: delayed the resolver to send DnsEvents, and ran
      resolv_integration_test
Change-Id: Id06546fca9438f89aaa2af383b34b52b7e536e26
parent 8430b000

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) {