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

Commit a0f37d0f authored by Hridya Valsaraju's avatar Hridya Valsaraju Committed by android-build-merger
Browse files

Merge "Increate testcase timeout for VtsHalHealthStorageV1_0TargetTest" 

am: 3a4601ba

Change-Id: I225726c4d9979024603a16ed5cdfd8f4fd040ffa
parents afe2661c 3a4601ba

health/storage/1.0/vts/functional/VtsHalHealthStorageV1_0TargetTest.cpp

+3 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ using ::std::literals::chrono_literals::operator""ms; 
const uint64_t kDevGcTimeoutSec = 120;

const std::chrono::seconds kDevGcTimeout{kDevGcTimeoutSec};

// Time accounted for RPC calls.

const std::chrono::milliseconds kRpcTime{100};

const std::chrono::milliseconds kRpcTime{1000};



template <typename R>

std::string toString(std::chrono::duration<R, std::milli> time) {
@@ -90,11 +90,8 @@ class GcCallback : public IGarbageCollectCallback, public Flag { 
    template <typename R, typename P>

    void waitForResult(std::chrono::duration<R, P> timeout, Result expected) {

        std::unique_lock<std::mutex> lock(mMutex);

        if (waitLocked(&lock, timeout)) {

        ASSERT_TRUE(waitLocked(&lock, timeout)) << "timeout after " << toString(timeout);

        EXPECT_EQ(expected, mResult);

        } else {

            LOG(INFO) << "timeout after " << toString(timeout);

        }

    }



   private: