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

Commit 93db0413 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

[Test] Fix MTS failure on GetAddrinfo_BlockDnsQueryWithUidRule am: 57997e80 

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



Change-Id: I0bb44b86338db700cd5d6ffbe5f78e9a5aeb6a99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72c4385b 57997e80

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ cc_test { 
        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libssl",

        "libc++fs",

        "libcutils",

        "netd_aidl_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

tests/resolv_integration_test.cpp

+5 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 


#include <algorithm>

#include <chrono>

#include <filesystem>

#include <functional>

#include <iterator>

#include <numeric>
@@ -127,6 +128,8 @@ using android::netdutils::ScopedAddrinfo; 
using android::netdutils::Stopwatch;

using android::netdutils::toHex;



namespace fs = std::filesystem;



namespace {



std::pair<ScopedAddrinfo, int> safe_getaddrinfo_time_taken(const char* node, const char* service,
@@ -4505,9 +4508,9 @@ TEST_F(ResolverTest, GetAddrinfo_BlockDnsQueryWithUidRule) { 
        const char* hname;

        const int expectedErrorCode;

    } kTestData[] = {

            {host_name, isAtLeastT() ? EAI_FAIL : EAI_NODATA},

            {host_name, (isAtLeastT() && fs::exists(DNS_HELPER)) ? EAI_FAIL : EAI_NODATA},

            // To test the query with search domain.

            {"howdy", isAtLeastT() ? EAI_FAIL : EAI_AGAIN},

            {"howdy", (isAtLeastT() && fs::exists(DNS_HELPER)) ? EAI_FAIL : EAI_AGAIN},

    };



    INetd* netdService = mDnsClient.netdService();

tests/resolv_test_utils.h

+5 −0
Original line number Diff line number Diff line
@@ -437,3 +437,8 @@ void RemoveMdnsRoute(); 
            GTEST_SKIP() << "Skipping test because SDK version is less than T."; \

        }                                                                        \

    } while (0)



static const std::string DNS_HELPER =

        android::bpf::isUserspace64bit()

                ? "/apex/com.android.tethering/lib64/libcom.android.tethering.dns_helper.so"

                : "/apex/com.android.tethering/lib/libcom.android.tethering.dns_helper.so";