commit 6982524c600f8476015557ee43cefa582f65451c
author Simon Shields <simonshields@google.com> Mon May 25 01:53:28 2020 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon May 25 01:53:28 2020 +0000
tree 35f3f5d4adef85f7054c40ac480cb1e2d56f7a32
parent 97c69a2067649da85af0fe0222faf5525f84fa09

[paver] Refactor GPT-based tests to use a shared base class

All these tests are initialised in basically the same way, so move the
code to a shared place. Future CLs will add more helper functions to
simplify tests.

Test: runtests -t paver-test -- -a true
Change-Id: Ibf7528d53294acf733dc5bcdd24e508b138cde40
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/391327
Reviewed-by: Suraj Malhotra <surajmalhotra@google.com>
Testability-Review: Suraj Malhotra <surajmalhotra@google.com>
Commit-Queue: Simon Shields <simonshields@google.com>

zircon/system/ulib/paver/test/device-partitioner-test.cc

diff --git a/zircon/system/ulib/paver/test/device-partitioner-test.cc b/zircon/system/ulib/paver/test/device-partitioner-test.cc
index eb07465..0d17aeb 100644
--- a/zircon/system/ulib/paver/test/device-partitioner-test.cc
+++ b/zircon/system/ulib/paver/test/device-partitioner-test.cc
@@ -278,12 +278,13 @@
             GUID_ZIRCON_A_NAME " (a b c)");
 }
 
-class EfiDevicePartitionerTests : public zxtest::Test {
+class GptDevicePartitionerTests : public zxtest::Test {
  protected:
-  EfiDevicePartitionerTests() {
+  GptDevicePartitionerTests(fbl::String board_name) {
     IsolatedDevmgr::Args args;
     args.driver_search_paths.push_back("/boot/driver");
     args.disable_block_watcher = false;
+    args.board_name = board_name;
     ASSERT_OK(IsolatedDevmgr::Create(&args, &devmgr_));
 
     fbl::unique_fd fd;
@@ -294,6 +295,11 @@
   IsolatedDevmgr devmgr_;
 };
 
+class EfiDevicePartitionerTests : public GptDevicePartitionerTests {
+ protected:
+  EfiDevicePartitionerTests() : GptDevicePartitionerTests(fbl::String()) {}
+};
+
 // TODO(fxb/42894): Re-enable after de-flaking
 TEST_F(EfiDevicePartitionerTests, DISABLED_InitializeWithoutGptFails) {
   std::unique_ptr<BlockDevice> gpt_dev;
@@ -614,18 +620,9 @@
                                          fbl::Span<uint8_t>()));
 }
 
-class CrosDevicePartitionerTests : public zxtest::Test {
+class CrosDevicePartitionerTests : public GptDevicePartitionerTests {
  protected:
-  CrosDevicePartitionerTests() {
-    IsolatedDevmgr::Args args;
-    args.driver_search_paths.push_back("/boot/driver");
-    args.disable_block_watcher = false;
-    ASSERT_OK(IsolatedDevmgr::Create(&args, &devmgr_));
-
-    fbl::unique_fd fd;
-    ASSERT_OK(RecursiveWaitForFile(devmgr_.devfs_root(), "misc/ramctl", &fd));
-    ASSERT_OK(RecursiveWaitForFile(devmgr_.devfs_root(), "sys/platform", &fd));
-  }
+  CrosDevicePartitionerTests() : GptDevicePartitionerTests(fbl::String()) {}
 
   // Create a disk with the given size in bytes.
   void CreateCrosDisk(uint64_t bytes, std::unique_ptr<BlockDevice>* device) {
@@ -651,8 +648,6 @@
         devmgr_.devfs_root().duplicate(), paver::Arch::kX64, fbl::unique_fd{dup(device->fd())},
         partitioner));
   }
-
-  IsolatedDevmgr devmgr_;
 };
 
 TEST_F(CrosDevicePartitionerTests, DISABLED_InitPartitionTables) {
@@ -969,21 +964,9 @@
       partitioner->SupportsPartition(PartitionSpec(paver::Partition::kZirconA, "foo_type")));
 }
 
-class SherlockPartitionerTests : public zxtest::Test {
+class SherlockPartitionerTests : public GptDevicePartitionerTests {
  protected:
-  SherlockPartitionerTests() {
-    IsolatedDevmgr::Args args;
-    args.driver_search_paths.push_back("/boot/driver");
-    args.disable_block_watcher = false;
-    args.board_name = "sherlock";
-    ASSERT_OK(IsolatedDevmgr::Create(&args, &devmgr_));
-
-    fbl::unique_fd fd;
-    ASSERT_OK(RecursiveWaitForFile(devmgr_.devfs_root(), "misc/ramctl", &fd));
-    ASSERT_OK(RecursiveWaitForFile(devmgr_.devfs_root(), "sys/platform", &fd));
-  }
-
-  IsolatedDevmgr devmgr_;
+  SherlockPartitionerTests() : GptDevicePartitionerTests("sherlock") {}
 };
 
 // TODO(fxb/42894): Re-enable after de-flaking