Remove test keys from images we test with in the test harness.

lib/cros_build_lib.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Common python commands used by various build scripts."""
 
 import inspect
 import os
 import re
 import subprocess
 import sys
 
 _STDOUT_IS_TTY = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
+_CROSUTILS_DIRECTORY = os.path.realpath(os.path.dirname(os.path.dirname(
+    __file__)))
 
 # TODO(sosa):  Move logging to logging module.
 
 class RunCommandException(Exception):
   """Raised when there is an error in RunCommand."""
   pass
 
 
 def GetCallerName():
   """Returns the name of the calling module with __main__."""
@@ skipping 266 matching lines @@
   either via a VM or remote machine on the same network.
   """
   ifconfig_output = RunCommand(['/sbin/ifconfig', device],
                                redirect_stdout=True, print_cmd=False)
   match = re.search('.*inet addr:(\d+\.\d+\.\d+\.\d+).*', ifconfig_output)
   if match:
     return match.group(1)
   else:
     Warning('Failed to find ip address in %s' % ifconfig_output)
     return None
+
+
+def MountImage(image_path, root_dir, stateful_dir, read_only):
+  """Mounts a Chromium OS image onto mount dir points."""
+  from_dir = os.path.dirname(image_path)
+  image = os.path.basename(image_path)
+  extra_args = []
+  if read_only: extra_args.append('--read_only')
+  cmd = ['./mount_gpt_image.sh',
+         '--from=%s' % from_dir,
+         '--image=%s' % image,
+         '--rootfs_mountpt=%s' % root_dir,
+         '--stateful_mountpt=%s' % stateful_dir,
+        ]
+  cmd.extend(extra_args)
+  RunCommand(cmd, print_cmd=False, redirect_stdout=True, redirect_stderr=True,
+             cwd=_CROSUTILS_DIRECTORY)
+
+
+def UnmountImage(root_dir, stateful_dir):
+  """Unmounts a Chromium OS image specified by mount dir points."""
+  RunCommand(['./mount_gpt_image.sh',
+              '--unmount',
+              '--rootfs_mountpt=%s' % root_dir,
+              '--stateful_mountpt=%s' % stateful_dir,
+             ], print_cmd=False, redirect_stdout=True, redirect_stderr=True,
+             cwd=_CROSUTILS_DIRECTORY)