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

Merge "Remove DiskStat checks from VTS Health HAL test" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-10 19:24:31 +00:00
committed by Android (Google) Code Review
parent 7bfef5998a 075c182f4d
commit 2b2ffe64d6
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp
View File

@@ -190,18 +190,6 @@ bool verifyStorageInfo(const hidl_vec<struct StorageInfo>& info) {
return true;
}
bool verifyDiskStats(const hidl_vec<struct DiskStats>& stats) {
for (size_t i = 0; i < stats.size(); i++) {
if (!(stats[i].reads > 0 && stats[i].readMerges > 0 && stats[i].readSectors > 0 &&
stats[i].readTicks > 0 && stats[i].writes > 0 && stats[i].writeMerges > 0 &&
stats[i].writeSectors > 0 && stats[i].writeTicks > 0 && stats[i].ioTicks > 0)) {
return false;
}
}
return true;
}
template <typename T>
bool verifyEnum(T value) {
for (auto it : hidl_enum_iterator<T>()) {
@@ -214,7 +202,7 @@ bool verifyEnum(T value) {
}
bool verifyHealthInfo(const HealthInfo& health_info) {
if (!verifyStorageInfo(health_info.storageInfos) || !verifyDiskStats(health_info.diskStats)) {
if (!verifyStorageInfo(health_info.storageInfos)) {
return false;
}
@@ -264,7 +252,7 @@ TEST_F(HealthHidlTest, Properties) {
EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyStorageInfo(value));
}));
EXPECT_OK(mHealth->getDiskStats([](auto result, auto& value) {
EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyDiskStats(value));
EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), true);
}));
EXPECT_OK(mHealth->getHealthInfo([](auto result, auto& value) {
EXPECT_VALID_OR_UNSUPPORTED_PROP(result, toString(value), verifyHealthInfo(value));