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

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

Merge "Test: Fix a flakiness in PrivateDnsConfigurationTest" am: 9c71c8b5... 

Merge "Test: Fix a flakiness in PrivateDnsConfigurationTest" am: 9c71c8b5 am: 54415c00 am: edead4d9

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



Change-Id: I176c140f52d25a7b7db62836e012beb5414c175c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1504bb0 edead4d9

PrivateDnsConfigurationTest.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ class PrivateDnsConfigurationTest : public NetNativeTestBase { 
        // must wait until every validation thread finishes.

        // must wait until every validation thread finishes.

        ON_CALL(mObserver, onValidationStateUpdate)

        ON_CALL(mObserver, onValidationStateUpdate)

                .WillByDefault([&](const std::string& server, Validation validation, uint32_t) {

                .WillByDefault([&](const std::string& server, Validation validation, uint32_t) {

                    if (validation == Validation::in_process) {

                    std::lock_guard guard(mObserver.lock);

                    std::lock_guard guard(mObserver.lock);

                    if (validation == Validation::in_process) {

                        auto it = mObserver.serverStateMap.find(server);

                        auto it = mObserver.serverStateMap.find(server);

                        if (it == mObserver.serverStateMap.end() ||

                        if (it == mObserver.serverStateMap.end() ||

                            it->second != Validation::in_process) {

                            it->second != Validation::in_process) {
@@ -73,7 +73,6 @@ class PrivateDnsConfigurationTest : public NetNativeTestBase { 
                               validation == Validation::fail) {

                               validation == Validation::fail) {

                        mObserver.runningThreads--;

                        mObserver.runningThreads--;

                    }

                    }

                    std::lock_guard guard(mObserver.lock);

                    mObserver.serverStateMap[server] = validation;

                    mObserver.serverStateMap[server] = validation;

                });

                });