ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: d5b690993b

Change-Id: I7a356d064a6c09cb0c2058e4ee4321816a399ecb
This commit is contained in:
Hridya Valsaraju 2019-03-22 14:21:39 -07:00 • committed by android-build-merger
commit cf96ead2fa
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fastboot/fuzzy_fastboot/fixtures.cpp
View file

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

1
fastboot/fuzzy_fastboot/fixtures.h
View file

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