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

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

Test: Deflake RepeatedSetup_NoRedundantPrivateDnsValidation am: a687b69a am:... 

Test: Deflake RepeatedSetup_NoRedundantPrivateDnsValidation am: a687b69a am: d75750c1 am: 1bad9e34

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



Change-Id: I68d5fae0cd424a3dffcf16fa97dd73218db2157b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 129f7108 1bad9e34

tests/resolv_integration_test.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -5636,12 +5636,11 @@ TEST_F(ResolverTest, RepeatedSetup_NoRedundantPrivateDnsValidation) { 
    parcel.tlsServers = {addr1, addr2, unusable_addr};

    parcel.tlsServers = {addr1, addr2, unusable_addr};

    ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));

    ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));





    // Check the validation results.

    // Check the validation status before proceed. The validation for `unresponsiveTls`

    // should be running, and the other two should be finished.

    EXPECT_TRUE(WaitForPrivateDnsValidation(workableTls.listen_address(), true));

    EXPECT_TRUE(WaitForPrivateDnsValidation(workableTls.listen_address(), true));

    EXPECT_TRUE(WaitForPrivateDnsValidation(unusable_addr, false));

    EXPECT_TRUE(WaitForPrivateDnsValidation(unusable_addr, false));



    EXPECT_TRUE(PollForCondition([&]() { return unresponsiveTls.acceptConnectionsCount() == 1; }));

    // The validation is still in progress.

    EXPECT_EQ(unresponsiveTls.acceptConnectionsCount(), 1);

    unresponsiveTls.clearConnectionsCount();

    unresponsiveTls.clearConnectionsCount();





    static const struct TestConfig {

    static const struct TestConfig {
@@ -5717,7 +5716,8 @@ TEST_F(ResolverTest, RepeatedSetup_NoRedundantPrivateDnsValidation) { 
        }

        }





        if (validationAttemptToUnresponsiveTls) {

        if (validationAttemptToUnresponsiveTls) {

            EXPECT_GT(unresponsiveTls.acceptConnectionsCount(), 0);

            EXPECT_TRUE(PollForCondition(

                    [&]() { return unresponsiveTls.acceptConnectionsCount() > 0; }));

        } else {

        } else {

            EXPECT_EQ(unresponsiveTls.acceptConnectionsCount(), 0);

            EXPECT_EQ(unresponsiveTls.acceptConnectionsCount(), 0);

        }

        }