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

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

Fix flaky ResolverTest.ConnectTlsServerTimeout due to flag reset am: 1a6cb493 am: 3dd3ea98 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib00e0c5ef547c93055c5c16d5e59bde7c8783f5b
parents 1703c96e 3dd3ea98

tests/resolv_integration_test.cpp

+2 −3
Original line number Diff line number Diff line
@@ -4326,9 +4326,6 @@ TEST_F(ResolverTest, ConnectTlsServerTimeout) { 
            {hostname2, ns_type::ns_t_a, "1.2.3.5"},

    };



    // The resolver will adjust the timeout value to 1000ms since the value is too small.

    ScopedSystemProperties scopedSystemProperties(kDotConnectTimeoutMsFlag, "100");



    static const struct TestConfig {

        bool asyncHandshake;

        int maxRetries;
@@ -4357,6 +4354,8 @@ TEST_F(ResolverTest, ConnectTlsServerTimeout) { 
        test::DnsTlsFrontend tls(addr, "853", addr, "53");

        ASSERT_TRUE(tls.startServer());



        // The resolver will adjust the timeout value to 1000ms since the value is too small.

        ScopedSystemProperties scopedSystemProperties(kDotConnectTimeoutMsFlag, "100");

        ScopedSystemProperties scopedSystemProperties1(kDotAsyncHandshakeFlag,

                                                       config.asyncHandshake ? "1" : "0");

        ScopedSystemProperties scopedSystemProperties2(kDotMaxretriesFlag,