commit b34a98b6df4e8a52e34899dabfebb24cfe715a4c
author Bertrand SIMONNET <bsimonnet@chromium.org> Wed Apr 22 14:30:04 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Apr 23 18:44:48 2015 +0000
tree bcf2e1fdbf9a6e3cc65c29d6658ef2bf2de765af
parent 0b2485d34b83b8953eb82194aee579b37d4a970e

brick_lib: Remove dead code.

FindBrickByName is not used anymore. Let's remove it.

BUG=None
TEST=unittests.

Change-Id: I70d85e9fd9cbe51cc85968c81441f5436fb4d78f
Reviewed-on: https://chromium-review.googlesource.com/266899
Trybot-Ready: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>

cli/flash_unittest.py

diff --git a/cli/flash_unittest.py b/cli/flash_unittest.py
index 70eed5c..8ec9098 100644
--- a/cli/flash_unittest.py
+++ b/cli/flash_unittest.py
@@ -40,19 +40,6 @@
     """Mock out SetupRootfsUpdate."""
 
 
-class BrickMock(partial_mock.PartialMock):
-  """Mock out brick_lib.Brick."""
-  TARGET = 'chromite.lib.brick_lib.Brick'
-  ATTRS = ('Inherits')
-
-  def __init__(self):
-    partial_mock.PartialMock.__init__(self)
-
-  def Inherits(self, _inst, *_args, **_kwargs):
-    """Mock out Inherits."""
-    return True
-
-
 class RemoteDeviceUpdaterTest(cros_test_lib.MockTempDirTestCase):
   """Test the flow of flash.Flash() with RemoteDeviceUpdater."""
 
@@ -74,33 +61,24 @@
 
   def testUpdateAll(self):
     """Tests that update methods are called correctly."""
-    proj = BrickMock()
     with mock.patch('os.path.exists', return_value=True):
-      with mock.patch('chromite.lib.brick_lib.FindBrickByName',
-                      return_value=proj):
-        flash.Flash(self.DEVICE, self.IMAGE)
-        self.assertTrue(self.updater_mock.patched['UpdateStateful'].called)
-        self.assertTrue(self.updater_mock.patched['UpdateRootfs'].called)
+      flash.Flash(self.DEVICE, self.IMAGE)
+      self.assertTrue(self.updater_mock.patched['UpdateStateful'].called)
+      self.assertTrue(self.updater_mock.patched['UpdateRootfs'].called)
 
   def testUpdateStateful(self):
     """Tests that update methods are called correctly."""
-    proj = BrickMock()
     with mock.patch('os.path.exists', return_value=True):
-      with mock.patch('chromite.lib.brick_lib.FindBrickByName',
-                      return_value=proj):
-        flash.Flash(self.DEVICE, self.IMAGE, rootfs_update=False)
-        self.assertTrue(self.updater_mock.patched['UpdateStateful'].called)
-        self.assertFalse(self.updater_mock.patched['UpdateRootfs'].called)
+      flash.Flash(self.DEVICE, self.IMAGE, rootfs_update=False)
+      self.assertTrue(self.updater_mock.patched['UpdateStateful'].called)
+      self.assertFalse(self.updater_mock.patched['UpdateRootfs'].called)
 
   def testUpdateRootfs(self):
     """Tests that update methods are called correctly."""
-    proj = BrickMock()
     with mock.patch('os.path.exists', return_value=True):
-      with mock.patch('chromite.lib.brick_lib.FindBrickByName',
-                      return_value=proj):
-        flash.Flash(self.DEVICE, self.IMAGE, stateful_update=False)
-        self.assertFalse(self.updater_mock.patched['UpdateStateful'].called)
-        self.assertTrue(self.updater_mock.patched['UpdateRootfs'].called)
+      flash.Flash(self.DEVICE, self.IMAGE, stateful_update=False)
+      self.assertFalse(self.updater_mock.patched['UpdateStateful'].called)
+      self.assertTrue(self.updater_mock.patched['UpdateRootfs'].called)
 
   def testMissingPayloads(self):
     """Tests we raise FlashError when payloads are missing."""
@@ -109,18 +87,15 @@
 
   def testProjectSdk(self):
     """Tests that Project SDK flashing invoked as expected."""
-    proj = BrickMock()
     with mock.patch('os.path.exists', return_value=True):
-      with mock.patch('chromite.lib.brick_lib.FindBrickByName',
-                      return_value=proj):
-        with mock.patch('chromite.lib.project_sdk.FindVersion',
-                        return_value='1.2.3'):
-          flash.Flash(self.DEVICE, self.IMAGE, project_sdk_image=True)
-          dev_server_wrapper.GetImagePathWithXbuddy.assert_called_with(
-              'project_sdk', mock.ANY, version='1.2.3', static_dir=mock.ANY,
-              lookup_only=True)
-          self.assertTrue(self.updater_mock.patched['UpdateStateful'].called)
-          self.assertTrue(self.updater_mock.patched['UpdateRootfs'].called)
+      with mock.patch('chromite.lib.project_sdk.FindVersion',
+                      return_value='1.2.3'):
+        flash.Flash(self.DEVICE, self.IMAGE, project_sdk_image=True)
+        dev_server_wrapper.GetImagePathWithXbuddy.assert_called_with(
+            'project_sdk', mock.ANY, version='1.2.3', static_dir=mock.ANY,
+            lookup_only=True)
+        self.assertTrue(self.updater_mock.patched['UpdateStateful'].called)
+        self.assertTrue(self.updater_mock.patched['UpdateRootfs'].called)
 
 
 class USBImagerMock(partial_mock.PartialCmdMock):