Roll web-page-replay to latest version

telemetry/third_party/webpagereplay/adb_install_cert.py

 # Copyright 2014 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 14 matching lines @@
 
 
 class CertInstallError(Exception):
   pass
 
 
 class CertRemovalError(Exception):
   pass
 
 
+class AdbShellError(subprocess.CalledProcessError):
+  pass
+
 
 _ANDROID_M_BUILD_VERSION = 23
 
 
 class AndroidCertInstaller(object):
   """Certificate installer for phones with KitKat."""
 
   def __init__(self, device_id, cert_name, cert_path):
     if not os.path.exists(cert_path):
       raise ValueError('Not a valid certificate path')
@@ skipping 34 matching lines @@
       raise subprocess.CalledProcessError(
           cmd=adb_cmd, returncode=process.returncode, output=adb_stdout)
     assert adb_stdout[-1] == '\n'
     prefix_pos = adb_stdout.rfind(RETURN_CODE_PREFIX)
     assert prefix_pos != -1, \
         'Couldn\'t find "%s" at the end of the output of %s' % (
             RETURN_CODE_PREFIX, subprocess.list2cmdline(adb_cmd))
     returncode = int(adb_stdout[prefix_pos + len(RETURN_CODE_PREFIX):])
     stdout = adb_stdout[:prefix_pos]
     if returncode != 0:
-      raise subprocess.CalledProcessError(
-          cmd=args, returncode=returncode, output=stdout)
+      raise AdbShellError(cmd=args, returncode=returncode, output=stdout)
     return stdout
 
   def _adb_su_shell(self, *args):
     """Runs command as root."""
     build_version_sdk = int(self._get_property('ro.build.version.sdk'))
     if build_version_sdk >= _ANDROID_M_BUILD_VERSION:
       cmd = ['su', '0']
     else:
       cmd = ['su', '-c']
     cmd.extend(args)
@@ skipping 36 matching lines @@
                                                              'CERTIFICATE')
     contents = ''.join([begin_cert, cert_body, description])
     with open(self.reformatted_cert_path, 'w') as cert_file:
       cert_file.write(contents)
 
   def _remove_cert_from_cacerts(self):
     self._adb_su_shell('mount', '-o', 'remount,rw', '/system')
     self._adb_su_shell('rm', '-f', self.android_cacerts_path)
 
   def _is_cert_installed(self):
-    return (self._adb_su_shell('ls', self.android_cacerts_path).strip() ==
-            self.android_cacerts_path)
+    try:
+      return (self._adb_su_shell('ls', self.android_cacerts_path).strip() ==
+              self.android_cacerts_path)
+    except AdbShellError:
+      return False
 
   def _generate_reformatted_cert_path(self):
     # Determine OpenSSL version, string is of the form
     # 'OpenSSL 0.9.8za 5 Jun 2014' .
     openssl_version = self._run_cmd(['openssl', 'version']).split()
 
     if len(openssl_version) < 2:
       raise ValueError('Unexpected OpenSSL version string: ', openssl_version)
 
     # subject_hash flag name changed as of OpenSSL version 1.0.0 .
@@ skipping 99 matching lines @@
   cert_installer = AndroidCertInstaller(args.device_id, args.cert_name,
                                         args.cert_path)
   if args.remove:
     cert_installer.remove_cert()
   else:
     cert_installer.install_cert(args.overwrite)
 
 
 if __name__ == '__main__':
   sys.exit(main())