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

Commit 65c74908 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9286410 from e9586597 to udc-d1-release 

Change-Id: Iff62d4b089cbe55a172cb2de6c9c6c626a6b90b2
parents 24404ca0 e9586597

tests/resolv_integration_test.cpp

+2 −8
Original line number Diff line number Diff line
@@ -750,17 +750,11 @@ TEST_F(ResolverTest, GetAddrInfo_localhost) { 
    StartDns(dns, {});

    ASSERT_TRUE(mDnsClient.SetResolversForNetwork());



    addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM};

    ScopedAddrinfo result = safe_getaddrinfo(kLocalHost, nullptr, &hints);

    ScopedAddrinfo result = safe_getaddrinfo(kLocalHost, nullptr, nullptr);

    EXPECT_TRUE(result != nullptr);

    // Expect no DNS queries; localhost is resolved via /etc/hosts

    EXPECT_TRUE(dns.queries().empty()) << dns.dumpQueries();

    if (android::modules::sdklevel::IsAtLeastU()) {

        // ::1 is added since U.

        EXPECT_THAT(ToStrings(result), testing::ElementsAre(kLocalHostAddr, kIp6LocalHostAddr));

    } else {

    EXPECT_EQ(kLocalHostAddr, ToString(result));

    }



    result = safe_getaddrinfo(kIp6LocalHost, nullptr, nullptr);

    EXPECT_TRUE(result != nullptr);