commit 85928c4dce43546d66671f4ef9a1bea53fa6d808
author Achuith Bhandarkar <achuith@chromium.org> Thu Apr 18 17:02:27 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Apr 24 15:51:50 2019 -0700
tree a9b49b80201b750d5411026d5ef63d1fa0b1fd34
parent 1d4c52828aed268c9f94e8affb453a110e2ccd63

devinstall_test: Mount root fs r/w

BUG=chromium:950180
TEST=../platform/crostestutils/devmode-test/devinstall_test.py --verbose betty ../build/images/betty/latest/chromiumos_test_image.bin

Change-Id: Id475be7e8f5d811f70a54a3217f488e2312acde3
Reviewed-on: https://chromium-review.googlesource.com/1575012
Commit-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Xiaoqian Dai <xdai@chromium.org>

devmode-test/devinstall_test.py

diff --git a/devmode-test/devinstall_test.py b/devmode-test/devinstall_test.py
index fed0aa3..69c6aed 100755
--- a/devmode-test/devinstall_test.py
+++ b/devmode-test/devinstall_test.py
@@ -92,6 +92,7 @@
 
   def _WipeDevInstall(self):
     """Wipes the devinstall state."""
+    logging.info('Wiping /usr/local/bin from the image.')
     r_mount_point = os.path.join(self.tmpdir, 'm')
     s_mount_point = os.path.join(self.tmpdir, 's')
     dev_image_path = os.path.join(s_mount_point, 'dev_image')
@@ -115,7 +116,6 @@
     shutil.copyfile(vm_path, self.working_image_path)
     logging.debug('Copy of vm image stored at %s.', self.working_image_path)
 
-    logging.info('Wiping /usr/local/bin from the image.')
     self._WipeDevInstall()
 
     self.port = remote_access.GetUnusedPort()
@@ -126,6 +126,8 @@
 
     self.device = remote_access.ChromiumOSDevice(
         remote_access.LOCALHOST, port=self.port, base_dir=self.tmpdir)
+    if not self.device.MountRootfsReadWrite():
+      raise TestError('Failed to make rootfs writeable')
 
     if not self.binhost:
       logging.info('Starting the devserver.')
@@ -146,8 +148,10 @@
            '"/usr/bin/dev_install --yes --binhost %s"' % self.binhost])
 
       logging.info('Verifying that python works on the image.')
-      self.device.RunCommand(['sudo', '-u', 'chronos', '--', 'python', '-c',
-                              '"print \'hello world\'"'])
+      # crbug.com/955147: /usr/local/bin/python symlink doesn't exist.
+      # Use python-wrapper instead.
+      self.device.RunCommand(['sudo', '-u', 'chronos', '--', 'python-wrapper',
+                              '-c', '"print \'hello world\'"'])
     except (cros_build_lib.RunCommandError,
             remote_access.SSHConnectionError) as e:
       self.devserver.PrintLog()