Merge "Don't require bootloader fastboot for VTS compliance." am: ac892d7569
Change-Id: Idd26ac600b75c1ea529edbf008d161e1e2790fd8
diff --git a/fastboot/fuzzy_fastboot/main.cpp b/fastboot/fuzzy_fastboot/main.cpp
index b9784fe..d9167e7 100644
--- a/fastboot/fuzzy_fastboot/main.cpp
+++ b/fastboot/fuzzy_fastboot/main.cpp
@@ -227,13 +227,6 @@
TEST_F(LogicalPartitionCompliance, FastbootRebootTest) {
ASSERT_TRUE(UserSpaceFastboot());
- GTEST_LOG_(INFO) << "Rebooting to bootloader mode";
- // Test 'fastboot reboot bootloader' from fastbootd
- fb->RebootTo("bootloader");
-
- // Test fastboot reboot fastboot from bootloader
- ReconnectFastbootDevice();
- ASSERT_FALSE(UserSpaceFastboot());
GTEST_LOG_(INFO) << "Rebooting back to fastbootd mode";
fb->RebootTo("fastboot");
@@ -268,23 +261,6 @@
GTEST_LOG_(INFO) << "Flashing a logical partition..";
EXPECT_EQ(fb->FlashPartition(test_partition_name, buf), SUCCESS)
<< "flash logical -partition failed";
- GTEST_LOG_(INFO) << "Rebooting to bootloader mode";
- // Reboot to bootloader mode and attempt to flash the logical partitions
- fb->RebootTo("bootloader");
-
- ReconnectFastbootDevice();
- ASSERT_FALSE(UserSpaceFastboot());
- GTEST_LOG_(INFO) << "Attempt to flash a logical partition..";
- EXPECT_EQ(fb->FlashPartition(test_partition_name, buf), DEVICE_FAIL)
- << "flash logical partition must fail in bootloader";
- GTEST_LOG_(INFO) << "Rebooting back to fastbootd mode";
- fb->RebootTo("fastboot");
-
- ReconnectFastbootDevice();
- ASSERT_TRUE(UserSpaceFastboot());
- GTEST_LOG_(INFO) << "Testing 'fastboot delete-logical-partition' command";
- EXPECT_EQ(fb->DeletePartition(test_partition_name), SUCCESS)
- << "delete logical-partition failed";
}
// Conformance tests