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

Commit 061c61f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Explicitly require root privs for tests requiring it"

parents e929e421 45d9baa3

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ cc_library_static { 
cc_test {

    name: "resolv_integration_test",

    test_suites: ["device-tests"],

    require_root: true,

    defaults: ["netd_defaults"],

    srcs: [

        "dns_responder/dns_responder.cpp",

dns_responder/dns_responder_client.cpp

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ void DnsResponderClient::SetUp() { 
    // binder setup

    auto binder = android::defaultServiceManager()->getService(android::String16("netd"));

    mNetdSrv = android::interface_cast<android::net::INetd>(binder);

    if (mNetdSrv == nullptr) {

        LOG(FATAL) << "Can't connect to service 'netd'. Missing root privileges? uid=" << getuid();

    }



    auto resolvBinder =

            android::defaultServiceManager()->getService(android::String16("dnsresolver"));

dnsresolver_binder_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ class DnsResolverBinderTest : public ::testing::Test { 
        if (binder != nullptr) {

            mDnsResolver = android::interface_cast<IDnsResolver>(binder);

        }

        // This could happen when the test isn't running as root, or if netd isn't running.

        assert(nullptr != mDnsResolver.get());

        // Create cache for test

        mDnsResolver->createNetworkCache(TEST_NETID);