commit a8e8f24ad7cf1da22dc85fbf3a176ea99cc863b1
author Mike Nichols <mikenichols@chromium.org> Mon Sep 09 14:10:29 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Sep 11 16:35:34 2019 +0000
tree 60eba43edf12d89debfd9621d6de098c69795c09
parent 8a2dbb335d51fa9417aa63a41bda79282d2497f4

test_image: Quick refactor to utilize partitions for loopback mounts

Update to script, and tests, to utilize paritions for loopback mounts,
versus offsets which are causing issues with the newer builder kernels.

BUG=chromium:1002184
TEST='https://ci.chromium.org/p/chromeos/builders/general/Try/b8902666560041157600'

Change-Id: I3575ab56fa02a749565e07c2e5dfab71549c6656
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1793419
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Tested-by: Mike Nichols <mikenichols@chromium.org>
Commit-Queue: Mike Nichols <mikenichols@chromium.org>

scripts/test_image_unittest.py

diff --git a/scripts/test_image_unittest.py b/scripts/test_image_unittest.py
index c1d7f20..67b861c 100644
--- a/scripts/test_image_unittest.py
+++ b/scripts/test_image_unittest.py
@@ -14,6 +14,7 @@
 from chromite.lib import constants
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_lib
+from chromite.lib import image_lib
 from chromite.lib import image_test_lib
 from chromite.lib import osutils
 from chromite.scripts import test_image
@@ -37,8 +38,8 @@
     )
     self.PatchObject(cros_build_lib, 'GetImageDiskPartitionInfo',
                      autospec=True, return_value=fake_partitions)
-    self.PatchObject(osutils.MountImageContext, '_Mount', autospec=True)
-    self.PatchObject(osutils.MountImageContext, '_Unmount', autospec=True)
+    self.PatchObject(image_lib.LoopbackPartitions, '_Mount', autospec=True)
+    self.PatchObject(image_lib.LoopbackPartitions, '_Unmount', autospec=True)
 
 
 class FindImageTest(TestImageTest):