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

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

Test: Fix DnsResolverBinderTest.setLogSeverity to set correct default log severity am: 450e0c5d 

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



Change-Id: I50ffb95a47b41769da1db00584a90de5b7af57d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9bd84f8a 450e0c5d

tests/dnsresolver_binder_test.cpp

+10 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <gtest/gtest.h>

#include <netdutils/Stopwatch.h>



#include <util.h>

#include "dns_metrics_listener/base_metrics_listener.h"

#include "dns_metrics_listener/test_metrics.h"

#include "unsolicited_listener/unsolicited_event_listener.h"
@@ -621,10 +622,16 @@ TEST_F(DnsResolverBinderTest, setLogSeverity) { 
    EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_ERROR).isOk());

    mExpectedLogData.push_back({"setLogSeverity(4)", "setLogSeverity.*4"});



    // Set back to default

    // Set back to default based off resolv_init(), the default is INFO for userdebug builds

    // and is WARNING for the other builds.

    if (isUserDebugBuild()) {

        EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_INFO).isOk());

        mExpectedLogData.push_back({"setLogSeverity(2)", "setLogSeverity.*2"});

    } else {

        EXPECT_TRUE(mDnsResolver->setLogSeverity(IDnsResolver::DNS_RESOLVER_LOG_WARNING).isOk());

        mExpectedLogData.push_back({"setLogSeverity(3)", "setLogSeverity.*3"});

    }

}



TEST_F(DnsResolverBinderTest, SetResolverOptions) {

    SKIP_IF_REMOTE_VERSION_LESS_THAN(mDnsResolver.get(), 9);