commit 74645231834e82d664791c34f29c63d7e0933270
author Benjamin Gordon <bmgordon@chromium.org> Fri May 04 17:40:42 2018 -0600
committer chrome-bot <chrome-bot@chromium.org> Thu May 17 03:24:21 2018 -0700
tree 02d7f36dd45ef0614535a2e8000103561198f530
parent 84d0e6526470aeda2f5b7caa85b4ccb608223083

cros_sdk_lib: Move chroot functions out of cros_build_lib

This lets us start breaking the circular dependencies between
cros_build_lib and osutils.  No functionality change other than
importing from the new module.

BUG=chromium:809634
TEST=unit tests pass; tryjobs

Change-Id: Icb3468e4322784d16368c1039fb505dc71089831
Reviewed-on: https://chromium-review.googlesource.com/1045618
Commit-Ready: Benjamin Gordon <bmgordon@chromium.org>
Tested-by: Benjamin Gordon <bmgordon@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>

scripts/cros_sdk_unittest.py

diff --git a/scripts/cros_sdk_unittest.py b/scripts/cros_sdk_unittest.py
index 4e5a5af..0a49ca8 100644
--- a/scripts/cros_sdk_unittest.py
+++ b/scripts/cros_sdk_unittest.py
@@ -11,6 +11,7 @@
 
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_logging as logging
+from chromite.lib import cros_sdk_lib
 from chromite.lib import cros_test_lib
 from chromite.lib import osutils
 from chromite.lib import sudo
@@ -55,7 +56,7 @@
     with sudo.SudoKeepAlive():
       # Create just enough of a chroot to fool cros_sdk into accepting it.
       self.chroot = os.path.join(self.tempdir, 'chroot')
-      cros_build_lib.MountChroot(self.chroot, create=True)
+      cros_sdk_lib.MountChroot(self.chroot, create=True)
       logging.debug('Chroot mounted on %s', self.chroot)
 
       chroot_etc = os.path.join(self.chroot, 'etc')
@@ -66,7 +67,7 @@
 
   def tearDown(self):
     with sudo.SudoKeepAlive():
-      cros_build_lib.CleanupChrootMount(self.chroot, delete_image=True)
+      cros_sdk_lib.CleanupChrootMount(self.chroot, delete_image=True)
 
   def _crosSdk(self, args):
     cmd = ['cros_sdk', '--chroot', self.chroot]
@@ -151,7 +152,7 @@
 
   def testCreateSnapshotMountsAsNeeded(self):
     with sudo.SudoKeepAlive():
-      cros_build_lib.CleanupChrootMount(self.chroot)
+      cros_sdk_lib.CleanupChrootMount(self.chroot)
 
     code, _ = self._crosSdk(['--snapshot-create', 'test'])
     self.assertEqual(code, 0)
@@ -213,7 +214,7 @@
 
       code, _ = self._crosSdk(['--snapshot-restore', 'test'])
       self.assertEqual(code, 0)
-      self.assertTrue(cros_build_lib.MountChroot(self.chroot, create=False))
+      self.assertTrue(cros_sdk_lib.MountChroot(self.chroot, create=False))
       self.assertExists(test_file)
 
       code, output = self._crosSdk(['--snapshot-list'])
@@ -233,7 +234,7 @@
       code, _ = self._crosSdk(['--snapshot-restore', 'test',
                                '--snapshot-create', 'test'])
       self.assertEqual(code, 0)
-      self.assertTrue(cros_build_lib.MountChroot(self.chroot, create=False))
+      self.assertTrue(cros_sdk_lib.MountChroot(self.chroot, create=False))
       self.assertExists(test_file)
 
       code, output = self._crosSdk(['--snapshot-list'])
@@ -272,7 +273,7 @@
 
       osutils.SafeUnlink(test_file)
 
-      cros_build_lib.CleanupChrootMount(self.chroot)
+      cros_sdk_lib.CleanupChrootMount(self.chroot)
 
       code, _ = self._crosSdk(['--snapshot-restore', 'test'])
       self.assertEqual(code, 0)