Merge "SF unit test: Disable flaky tests" (2c11aff4) · Commits · e / os / android_frameworks_native

services/surfaceflinger/tests/unittests/OneShotTimerTest.cpp

+8 −4

Original line number	Diff line number	Diff line
		@@ -72,7 +72,8 @@ TEST_F(OneShotTimerTest, startStopTest) {
		mIdleTimer->stop();
		}

		TEST_F(OneShotTimerTest, resetTest) {
		// TODO(b/186417847) This test is flaky. Reenable once fixed.
		TEST_F(OneShotTimerTest, DISABLED_resetTest) {
		fake::FakeClock* clock = new fake::FakeClock();
		mIdleTimer = std::make_unique<scheduler::OneShotTimer>("TestTimer", 1ms,
		mResetTimerCallback.getInvocable(),
		@@ -94,7 +95,8 @@ TEST_F(OneShotTimerTest, resetTest) {
		EXPECT_FALSE(mResetTimerCallback.waitForUnexpectedCall().has_value());
		}

		TEST_F(OneShotTimerTest, resetBackToBackTest) {
		// TODO(b/186417847) This test is flaky. Reenable once fixed.
		TEST_F(OneShotTimerTest, DISABLED_resetBackToBackTest) {
		fake::FakeClock* clock = new fake::FakeClock();
		mIdleTimer = std::make_unique<scheduler::OneShotTimer>("TestTimer", 1ms,
		mResetTimerCallback.getInvocable(),
		@@ -144,7 +146,8 @@ TEST_F(OneShotTimerTest, startNotCalledTest) {
		EXPECT_FALSE(mResetTimerCallback.waitForUnexpectedCall().has_value());
		}

		TEST_F(OneShotTimerTest, idleTimerIdlesTest) {
		// TODO(b/186417847) This test is flaky. Reenable once fixed.
		TEST_F(OneShotTimerTest, DISABLED_idleTimerIdlesTest) {
		fake::FakeClock* clock = new fake::FakeClock();
		mIdleTimer = std::make_unique<scheduler::OneShotTimer>("TestTimer", 1ms,
		mResetTimerCallback.getInvocable(),
		@@ -169,7 +172,8 @@ TEST_F(OneShotTimerTest, idleTimerIdlesTest) {
		EXPECT_FALSE(mResetTimerCallback.waitForUnexpectedCall().has_value());
		}

		TEST_F(OneShotTimerTest, timeoutCallbackExecutionTest) {
		// TODO(b/186417847) This test is flaky. Reenable once fixed.
		TEST_F(OneShotTimerTest, DISABLED_timeoutCallbackExecutionTest) {
		fake::FakeClock* clock = new fake::FakeClock();
		mIdleTimer = std::make_unique<scheduler::OneShotTimer>("TestTimer", 1ms,
		mResetTimerCallback.getInvocable(),