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

Commit 763a8538 authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

Merge "SF: Disable OneShotTimerTest#noCallbacksAfterStopAndResetTest" into udc-dev am: dc34d937 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21563659



Change-Id: I157eb9adc98af3ec30792de8a21993f3ad75006f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c7a22e2 dc34d937

services/surfaceflinger/tests/unittests/OneShotTimerTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ TEST_F(OneShotTimerTest, DISABLED_timeoutCallbackExecutionTest) { 
    EXPECT_FALSE(mResetTimerCallback.waitForUnexpectedCall().has_value());

}



TEST_F(OneShotTimerTest, noCallbacksAfterStopAndResetTest) {

// TODO(b/186417847) This test is flaky. Reenable once fixed.

TEST_F(OneShotTimerTest, DISABLED_noCallbacksAfterStopAndResetTest) {

    fake::FakeClock* clock = new fake::FakeClock();

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>("TestTimer", 1ms,

                                                           mResetTimerCallback.getInvocable(),