Re-enable boot HAL tests and make sure they restore previous slot flags. am: d028b91f4a (f37dbbc5) · Commits · e / os / android_hardware_interfaces

boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp

+25 −12

Original line number	Diff line number	Diff line
		@@ -80,9 +80,11 @@ TEST_P(BootHidlTest, MarkBootSuccessful) {
		}
		}

		// TODO(b/156557331): The test should switch back to the original boot slot.
		// Sanity check Boot::setActiveBootSlot() on good and bad inputs.
		TEST_P(BootHidlTest, DISABLED_SetActiveBootSlot) {
		TEST_P(BootHidlTest, SetActiveBootSlot) {
		Slot curSlot = boot->getCurrentSlot();
		Slot otherSlot = curSlot ? 0 : 1;
		auto otherBootable = boot->isSlotBootable(otherSlot);

		for (Slot s = 0; s < 2; s++) {
		CommandResult cr;
		Return<void> result = boot->setActiveBootSlot(s, generate_callback(&cr));
		@@ -91,7 +93,17 @@ TEST_P(BootHidlTest, DISABLED_SetActiveBootSlot) {
		{
		// Restore original flags to avoid problems on reboot
		CommandResult cr;
		Return<void> result = boot->markBootSuccessful(generate_callback(&cr));
		auto result = boot->setActiveBootSlot(curSlot, generate_callback(&cr));
		EXPECT_TRUE(result.isOk());
		EXPECT_TRUE(cr.success);

		if (otherBootable == BoolResult::FALSE) {
		result = boot->setSlotAsUnbootable(otherSlot, generate_callback(&cr));
		EXPECT_TRUE(result.isOk());
		EXPECT_TRUE(cr.success);
		}

		result = boot->markBootSuccessful(generate_callback(&cr));
		EXPECT_TRUE(result.isOk());
		EXPECT_TRUE(cr.success);
		}
		@@ -104,22 +116,23 @@ TEST_P(BootHidlTest, DISABLED_SetActiveBootSlot) {
		}
		}

		// TODO(b/156557331): It should switch back the original boot slot after testing.
		// Sanity check Boot::setSlotAsUnbootable() on good and bad inputs.
		TEST_P(BootHidlTest, DISABLED_SetSlotAsUnbootable) {
		{
		CommandResult cr;
		TEST_P(BootHidlTest, SetSlotAsUnbootable) {
		Slot curSlot = boot->getCurrentSlot();
		Slot otherSlot = curSlot ? 0 : 1;
		auto otherBootable = boot->isSlotBootable(otherSlot);
		{
		CommandResult cr;
		Return<void> result = boot->setSlotAsUnbootable(otherSlot, generate_callback(&cr));
		EXPECT_TRUE(result.isOk());
		if (cr.success) {
		EXPECT_EQ(BoolResult::FALSE, boot->isSlotBootable(otherSlot));

		// Restore original flags to avoid problems on reboot
		if (otherBootable == BoolResult::TRUE) {
		result = boot->setActiveBootSlot(otherSlot, generate_callback(&cr));
		EXPECT_TRUE(result.isOk());
		EXPECT_TRUE(cr.success);
		}
		result = boot->setActiveBootSlot(curSlot, generate_callback(&cr));
		EXPECT_TRUE(result.isOk());
		EXPECT_TRUE(cr.success);