Fuzzy_fastboot must set back the original slot after test

Test: ./fuzzy_fastboot --gtest_filter=Conformance.SetActive Bug: 117220134 Change-Id: I1fb6975dda52ace3e6d2a81a50cba5ff55310818
gj86 · Mar 18, 2019 · bcab240 · bcab240
1 parent cd67fa9
commit bcab240
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/fastboot/fuzzy_fastboot/fixtures.cpp b/fastboot/fuzzy_fastboot/fixtures.cpp
@@ -128,10 +128,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();
 
@@ -227,6 +231,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>

diff --git a/fastboot/fuzzy_fastboot/fixtures.h b/fastboot/fuzzy_fastboot/fixtures.h
@@ -69,6 +69,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>