Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "health storage hal vts test: add more tolerance."

Browse Source 
am: 0104792162

Change-Id: I5d9fc1fbbfcd83812e1c8750ccd13126d569644d
This commit is contained in:
Yifan Hong
2019-06-24 16:38:59 -07:00
committed by android-build-merger
parent 3059c66d53 0104792162
commit db166f768d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
health/storage/1.0/vts/functional/VtsHalHealthStorageV1_0TargetTest.cpp
View File

@@ -35,6 +35,9 @@ using ::std::literals::chrono_literals::operator""ms;
// Dev GC timeout. This is the timeout used by vold.
const uint64_t kDevGcTimeoutSec = 120;
const std::chrono::seconds kDevGcTimeout{kDevGcTimeoutSec};
// Dev GC timeout tolerance. The HAL may not immediately return after the
// timeout, so include an acceptable tolerance.
const std::chrono::seconds kDevGcTolerance{3};
// Time accounted for RPC calls.
const std::chrono::milliseconds kRpcTime{1000};
@@ -156,8 +159,9 @@ TEST_F(HealthStorageHidlTest, GcNullCallback) {
ASSERT_OK(ret);
// Hold test process because HAL can be single-threaded and doing GC.
ASSERT_TRUE(ping(kDevGcTimeout + kRpcTime))
<< "Service must be available after " << toString(kDevGcTimeout + kRpcTime);
ASSERT_TRUE(ping(kDevGcTimeout + kDevGcTolerance + kRpcTime))
<< "Service must be available after "
<< toString(kDevGcTimeout + kDevGcTolerance + kRpcTime);
}
/**
@@ -167,7 +171,7 @@ TEST_F(HealthStorageHidlTest, GcNonNullCallback) {
sp<GcCallback> cb = new GcCallback();
auto ret = fs->garbageCollect(kDevGcTimeoutSec, cb);
ASSERT_OK(ret);
cb->waitForResult(kDevGcTimeout + kRpcTime, Result::SUCCESS);
cb->waitForResult(kDevGcTimeout + kDevGcTolerance + kRpcTime, Result::SUCCESS);
}
} // namespace V1_0