tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "health storage hal vts test: add more tolerance." into qt-dev

Browse source 
am: 5a58efedd8

Change-Id: I0b45e9bf37b70bb6e4b0e00f2a2597d59d04f8bd
This commit is contained in:
Yifan Hong 2019-06-24 16:35:39 -07:00 committed by android-build-merger
commit b0673a3b4b
1 changed files with 7 additions and 3 deletions
Show stats 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