Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eba01f8 authored by Yifan Hong's avatar Yifan Hong
Browse files

health storage hal vts test: add more tolerance. 

Test: run on blueline
Bug: 135631007
Change-Id: Ie1770a4a152a045e5f40eaf9cd7b551fe391a0b1
Merged-In: Ie1770a4a152a045e5f40eaf9cd7b551fe391a0b1
(cherry picked from commit ae3d61c2)
parent 1f968cd8

health/storage/1.0/vts/functional/VtsHalHealthStorageV1_0TargetTest.cpp

+7 −3
Original line number Original line Diff line number Diff line
@@ -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