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

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

Browse Source
This commit is contained in:
Treehugger Robot
2019-06-24 18:22:38 +00:00
committed by Gerrit Code Review
parent b575cedd74 ae3d61c2c3
commit 0104792162
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. // Dev GC timeout. This is the timeout used by vold.
const uint64_t kDevGcTimeoutSec = 120; const uint64_t kDevGcTimeoutSec = 120;
const std::chrono::seconds kDevGcTimeout{kDevGcTimeoutSec}; 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. // Time accounted for RPC calls.
const std::chrono::milliseconds kRpcTime{1000}; const std::chrono::milliseconds kRpcTime{1000};
@@ -156,8 +159,9 @@ TEST_F(HealthStorageHidlTest, GcNullCallback) {
ASSERT_OK(ret); ASSERT_OK(ret);
// Hold test process because HAL can be single-threaded and doing GC. // Hold test process because HAL can be single-threaded and doing GC.
ASSERT_TRUE(ping(kDevGcTimeout + kRpcTime)) ASSERT_TRUE(ping(kDevGcTimeout + kDevGcTolerance + kRpcTime))
<< "Service must be available after " << toString(kDevGcTimeout + kRpcTime); << "Service must be available after "
<< toString(kDevGcTimeout + kDevGcTolerance + kRpcTime);
} }
/** /**
@@ -167,7 +171,7 @@ TEST_F(HealthStorageHidlTest, GcNonNullCallback) {
sp<GcCallback> cb = new GcCallback(); sp<GcCallback> cb = new GcCallback();
auto ret = fs->garbageCollect(kDevGcTimeoutSec, cb); auto ret = fs->garbageCollect(kDevGcTimeoutSec, cb);
ASSERT_OK(ret); ASSERT_OK(ret);
cb->waitForResult(kDevGcTimeout + kRpcTime, Result::SUCCESS); cb->waitForResult(kDevGcTimeout + kDevGcTolerance + kRpcTime, Result::SUCCESS);
} }
} // namespace V1_0 } // namespace V1_0