From 7868246e3067f65d3051caa72bff5094f93887fc Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 27 Jan 2020 12:54:16 -0800 Subject: [PATCH] Don't require bootloader fastboot for VTS compliance. Bug: 144820025 Test: vts Change-Id: Ib99ddbe611645fe0f89134a628ddb486b02df170 --- fastboot/fuzzy_fastboot/main.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/fastboot/fuzzy_fastboot/main.cpp b/fastboot/fuzzy_fastboot/main.cpp index b9784fef4..d9167e75b 100644 --- a/fastboot/fuzzy_fastboot/main.cpp +++ b/fastboot/fuzzy_fastboot/main.cpp @@ -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