Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev

This commit is contained in:
Treehugger Robot 2020-02-19 23:44:14 +00:00 committed by Gerrit Code Review
commit cd7a018917

View file

@ -227,13 +227,6 @@ TEST_F(LogicalPartitionCompliance, GetVarIsLogical) {
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 @@ TEST_F(LogicalPartitionCompliance, CreateResizeDeleteLP) {
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