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

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

Test: Replace wait_until() with wait_for() am: 18f4d9eb 

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



Change-Id: I94954ee13c100a2c6e6bb1e207e82ec5f72c830d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40d92069 18f4d9eb

tests/dns_metrics_listener/dns_metrics_listener.cpp

+3 −11
Original line number Diff line number Diff line
@@ -95,18 +95,10 @@ bool DnsMetricsListener::waitForNat64Prefix(ExpectNat64PrefixStatus status, mill 


bool DnsMetricsListener::waitForPrivateDnsValidation(const std::string& serverAddr,

                                                     const bool validated) {

    const auto now = std::chrono::steady_clock::now();



    std::unique_lock lock(mMutex);

    ScopedLockAssertion assume_lock(mMutex);



    // onPrivateDnsValidationEvent() might already be invoked. Search for the record first.

    do {

        if (findAndRemoveValidationRecord({mNetId, serverAddr}, validated)) return true;

    } while (mCv.wait_until(lock, now + kEventTimeoutMs) != std::cv_status::timeout);



    // Timeout.

    return false;

    return mCv.wait_for(lock, kEventTimeoutMs, [&]() REQUIRES(mMutex) {

        return findAndRemoveValidationRecord({mNetId, serverAddr}, validated);

    });

}



bool DnsMetricsListener::findAndRemoveValidationRecord(const ServerKey& key, const bool value) {

tests/unsolicited_listener/unsolicited_event_listener.cpp

+3 −11
Original line number Diff line number Diff line
@@ -68,18 +68,10 @@ constexpr milliseconds kRetryIntervalMs{20}; 


bool UnsolicitedEventListener::waitForPrivateDnsValidation(const std::string& serverAddr,

                                                           int validation, int protocol) {

    const auto now = std::chrono::steady_clock::now();



    std::unique_lock lock(mMutex);

    ScopedLockAssertion assume_lock(mMutex);



    // onPrivateDnsValidationEvent() might already be invoked. Search for the record first.

    do {

        if (findAndRemoveValidationRecord({mNetId, serverAddr, protocol}, validation)) return true;

    } while (mCv.wait_until(lock, now + kEventTimeoutMs) != std::cv_status::timeout);



    // Timeout.

    return false;

    return mCv.wait_for(lock, kEventTimeoutMs, [&]() REQUIRES(mMutex) {

        return findAndRemoveValidationRecord({mNetId, serverAddr, protocol}, validation);

    });

}



bool UnsolicitedEventListener::findAndRemoveValidationRecord(const ServerKey& key, int value) {