Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af0b4df3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Don't require bootloader fastboot for VTS compliance." am: ac892d75... 

Merge "Don't require bootloader fastboot for VTS compliance." am: ac892d75 am: 83eda512 am: 881bf894

Change-Id: I915ac4b54706615ecab5dc48452b74d09e49befd
parents 058aaaab 881bf894

fastboot/fuzzy_fastboot/main.cpp

+0 −24
Original line number Original line Diff line number Diff line
@@ -227,13 +227,6 @@ TEST_F(LogicalPartitionCompliance, GetVarIsLogical) { 




TEST_F(LogicalPartitionCompliance, FastbootRebootTest) {

TEST_F(LogicalPartitionCompliance, FastbootRebootTest) {

    ASSERT_TRUE(UserSpaceFastboot());

    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";

    GTEST_LOG_(INFO) << "Rebooting back to fastbootd mode";

    fb->RebootTo("fastboot");

    fb->RebootTo("fastboot");
@@ -268,23 +261,6 @@ TEST_F(LogicalPartitionCompliance, CreateResizeDeleteLP) { 
    GTEST_LOG_(INFO) << "Flashing a logical partition..";

    GTEST_LOG_(INFO) << "Flashing a logical partition..";

    EXPECT_EQ(fb->FlashPartition(test_partition_name, buf), SUCCESS)

    EXPECT_EQ(fb->FlashPartition(test_partition_name, buf), SUCCESS)

            << "flash logical -partition failed";

            << "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

// Conformance tests