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

Commit 8312b93b authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Fix another string-compare warning am: 4c254cfe 

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



Change-Id: Id68ad17e15cb9df5524cee5dce3c15d1730c631f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88d16f2f 4c254cfe

tests/resolv_integration_test.cpp

+3 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <chrono>

#include <iterator>

#include <numeric>

#include <string_view>

#include <thread>

#include <unordered_set>
@@ -4677,7 +4678,7 @@ TEST_F(ResolverTest, ConnectTlsServerTimeout_ConcurrentQueries) { 
        ScopedSystemProperties sp6(kDotRevalidationThresholdFlag, "-1");

        resetNetwork();



        for (const auto& dnsMode : {"OPPORTUNISTIC", "STRICT"}) {

        for (const std::string_view dnsMode : {"OPPORTUNISTIC", "STRICT"}) {

            SCOPED_TRACE(fmt::format("testConfig: [{}, {}]", testConfigCount, dnsMode));



            // Because a DnsTlsTransport lasts at least 5 minutes in spite of network
@@ -4747,7 +4748,7 @@ TEST_F(ResolverTest, QueryTlsServerTimeout) { 
    };



    for (const int queryTimeoutMs : {INFINITE_QUERY_TIMEOUT, 1000}) {

        for (const auto& dnsMode : {"OPPORTUNISTIC", "STRICT"}) {

        for (const std::string_view dnsMode : {"OPPORTUNISTIC", "STRICT"}) {

            SCOPED_TRACE(fmt::format("testConfig: [{}] [{}]", dnsMode, queryTimeoutMs));



            const std::string addr = getUniqueIPv4Address();