Merge "Increate testcase timeout for VtsHalHealthStorageV1_0TargetTest"

This commit is contained in:
Treehugger Robot
2019-02-15 17:24:14 +00:00
committed by Gerrit Code Review

View File

@@ -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)) {
EXPECT_EQ(expected, mResult);
} else {
LOG(INFO) << "timeout after " << toString(timeout);
}
ASSERT_TRUE(waitLocked(&lock, timeout)) << "timeout after " << toString(timeout);
EXPECT_EQ(expected, mResult);
}
private: