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

Commit d5b69099 authored by Hridya Valsaraju's avatar Hridya Valsaraju Committed by Gerrit Code Review
Browse files

Merge "Fuzzy_fastboot must set back the original slot after test"

parents 605eab93 bcab240c

fastboot/fuzzy_fastboot/fixtures.cpp

+5 −0
Original line number Diff line number Diff line
@@ -130,10 +130,14 @@ void FastBootTest::SetUp() { 
        ASSERT_EQ(device_path, cb_scratch);  // The path can not change

    }

    fb = std::unique_ptr<FastBootDriver>(new FastBootDriver(transport.get(), {}, true));

    // No error checking since non-A/B devices may not support the command

    fb->GetVar("current-slot", &initial_slot);

}



void FastBootTest::TearDown() {

    EXPECT_TRUE(UsbStillAvailible()) << USB_PORT_GONE;

    // No error checking since non-A/B devices may not support the command

    fb->SetActive(initial_slot);



    TearDownSerial();
@@ -232,6 +236,7 @@ void FastBootTest::SetLockState(bool unlock, bool assert_change) { 


std::string FastBootTest::device_path = "";

std::string FastBootTest::cb_scratch = "";

std::string FastBootTest::initial_slot = "";

int FastBootTest::serial_port = 0;



template <bool UNLOCKED>

fastboot/fuzzy_fastboot/fixtures.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ class FastBootTest : public testing::Test { 
    // This is an annoying hack

    static std::string cb_scratch;

    static std::string device_path;

    static std::string initial_slot;

};



template <bool UNLOCKED>