Merge "[VTS] Ignore tests of setting Active Boot Slot." am: b77ff497cd am: 09ed9b977e

Change-Id: Ib31a8574afa11555cdf1c7c3857dbb532c3e1d12

1 files changed, 4 insertions, 2 deletions

diff --git a/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp b/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp
index fbddf6d7e1..08958bd1f9 100644
--- a/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp
+++ b/boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp
@@ -80,8 +80,9 @@ 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, SetActiveBootSlot) {
+TEST_P(BootHidlTest, DISABLED_SetActiveBootSlot) {
     for (Slot s = 0; s < 2; s++) {
         CommandResult cr;
         Return<void> result = boot->setActiveBootSlot(s, generate_callback(&cr));
@@ -103,8 +104,9 @@ TEST_P(BootHidlTest, 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, SetSlotAsUnbootable) {
+TEST_P(BootHidlTest, DISABLED_SetSlotAsUnbootable) {
     {
         CommandResult cr;
         Slot curSlot = boot->getCurrentSlot();