Commit 234a0522 authored May 01, 2025 by Alec Mouri

Check if bootmode tests were skipped before teardown

If we decided to skip the bootmode tests, it means the device didn't have enough capabilities (non-support, or a single display mode) for them to be meaningful. It also means:

* We never poked at the apis, so we don't need to clean up our own usage, and
* If boot modes aren't supported, then cleaning ourselves up will report errors from these apis, which would cause the tests to fail.

So, just skip teardown if the test was also skipped.

Bug: 389190752
Flag: EXEMPT test only
Test: this
Change-Id: Ida7635f1da540251196e9af2d060962cfeed72fc

parent e8e1468e

services/surfaceflinger/tests/BootDisplayMode_test.cpp

+9 −7

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ protected:
		}

		void TearDown() override {
		if (!IsSkipped()) {
		binder::Status status = mSf->setBootDisplayMode(mDisplayToken, mOldMode);
		EXPECT_EQ(NO_ERROR, statusTFromBinderStatus(status));

		@@ -73,6 +74,7 @@ protected:
		EXPECT_EQ(NO_ERROR, statusTFromBinderStatus(status));
		EXPECT_EQ(mOldMode, info.preferredBootDisplayMode);
		}
		}

		ui::DisplayModeId mOldMode;
		ui::DisplayModeId mNewMode;