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

Commit 3e27100d authored by Lloyd Pique's avatar Lloyd Pique Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] SF: Disable flaky unit tests am: c60bf709 

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

Change-Id: I6cc53146822a0c1821b35d1c8ed9febf36d0a0d3
parents f183eef4 c60bf709

services/surfaceflinger/tests/unittests/LayerHistoryTestV2.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -120,7 +120,8 @@ protected: 




namespace {

namespace {





TEST_F(LayerHistoryTestV2, oneLayer) {

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

TEST_F(LayerHistoryTestV2, DISABLED_oneLayer) {

    const auto layer = createLayer();

    const auto layer = createLayer();

    EXPECT_CALL(*layer, isVisible()).WillRepeatedly(Return(true));

    EXPECT_CALL(*layer, isVisible()).WillRepeatedly(Return(true));

    EXPECT_CALL(*layer, getFrameRateForLayerTree()).WillRepeatedly(Return(Layer::FrameRate()));

    EXPECT_CALL(*layer, getFrameRateForLayerTree()).WillRepeatedly(Return(Layer::FrameRate()));
@@ -631,7 +632,8 @@ TEST_F(LayerHistoryTestV2, infrequentAnimatingLayer) { 
    EXPECT_EQ(1, animatingLayerCount(time));

    EXPECT_EQ(1, animatingLayerCount(time));

}

}





TEST_F(LayerHistoryTestV2, heuristicLayer60Hz) {

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

TEST_F(LayerHistoryTestV2, DISABLED_heuristicLayer60Hz) {

    const auto layer = createLayer();

    const auto layer = createLayer();

    EXPECT_CALL(*layer, isVisible()).WillRepeatedly(Return(true));

    EXPECT_CALL(*layer, isVisible()).WillRepeatedly(Return(true));

    EXPECT_CALL(*layer, getFrameRateForLayerTree()).WillRepeatedly(Return(Layer::FrameRate()));

    EXPECT_CALL(*layer, getFrameRateForLayerTree()).WillRepeatedly(Return(Layer::FrameRate()));

services/surfaceflinger/tests/unittests/OneShotTimerTest.cpp

+10 −5
Original line number Original line Diff line number Diff line
@@ -80,7 +80,8 @@ TEST_F(OneShotTimerTest, startStopTest) { 
    mIdleTimer->stop();

    mIdleTimer->stop();

}

}





TEST_F(OneShotTimerTest, resetTest) {

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

TEST_F(OneShotTimerTest, DISABLED_resetTest) {

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(20ms, mResetTimerCallback.getInvocable(),

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(20ms, mResetTimerCallback.getInvocable(),

                                                           mExpiredTimerCallback.getInvocable());

                                                           mExpiredTimerCallback.getInvocable());

    mIdleTimer->start();

    mIdleTimer->start();
@@ -105,7 +106,8 @@ TEST_F(OneShotTimerTest, resetTest) { 
    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

}

}





TEST_F(OneShotTimerTest, resetBackToBackTest) {

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

TEST_F(OneShotTimerTest, DISABLED_resetBackToBackTest) {

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(20ms, mResetTimerCallback.getInvocable(),

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(20ms, mResetTimerCallback.getInvocable(),

                                                           mExpiredTimerCallback.getInvocable());

                                                           mExpiredTimerCallback.getInvocable());

    mIdleTimer->start();

    mIdleTimer->start();
@@ -136,7 +138,8 @@ TEST_F(OneShotTimerTest, resetBackToBackTest) { 
    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

}

}





TEST_F(OneShotTimerTest, startNotCalledTest) {

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

TEST_F(OneShotTimerTest, DISABLED_startNotCalledTest) {

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(3ms, mResetTimerCallback.getInvocable(),

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(3ms, mResetTimerCallback.getInvocable(),

                                                           mExpiredTimerCallback.getInvocable());

                                                           mExpiredTimerCallback.getInvocable());

    // The start hasn't happened, so the callback does not happen.

    // The start hasn't happened, so the callback does not happen.
@@ -148,7 +151,8 @@ TEST_F(OneShotTimerTest, startNotCalledTest) { 
    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

}

}





TEST_F(OneShotTimerTest, idleTimerIdlesTest) {

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

TEST_F(OneShotTimerTest, DISABLED_idleTimerIdlesTest) {

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(3ms, mResetTimerCallback.getInvocable(),

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(3ms, mResetTimerCallback.getInvocable(),

                                                           mExpiredTimerCallback.getInvocable());

                                                           mExpiredTimerCallback.getInvocable());

    mIdleTimer->start();

    mIdleTimer->start();
@@ -168,7 +172,8 @@ TEST_F(OneShotTimerTest, idleTimerIdlesTest) { 
    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

    EXPECT_FALSE(mResetTimerCallback.waitForCall(0ms).has_value());

}

}





TEST_F(OneShotTimerTest, timeoutCallbackExecutionTest) {

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

TEST_F(OneShotTimerTest, DISABLED_timeoutCallbackExecutionTest) {

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(3ms, mResetTimerCallback.getInvocable(),

    mIdleTimer = std::make_unique<scheduler::OneShotTimer>(3ms, mResetTimerCallback.getInvocable(),

                                                           mExpiredTimerCallback.getInvocable());

                                                           mExpiredTimerCallback.getInvocable());

    mIdleTimer->start();

    mIdleTimer->start();