Roll webpagereplay 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 36 matching lines @@
     self.cert_path = cert_path
     self.file_name = os.path.basename(self.cert_path)
     self.reformatted_cert_fname = None
     self.reformatted_cert_path = None
     self.android_cacerts_path = None
 
   @staticmethod
   def _run_cmd(cmd, dirname=None):
     return subprocess.check_output(cmd, cwd=dirname)
 
-  def _adb(self, *args):
-    """Runs the adb command."""
+  def _get_adb_cmd(self, *args):
     cmd = ['adb']
     if self.device_id:
       cmd.extend(['-s', self.device_id])
     cmd.extend(args)
-    return self._run_cmd(cmd)
+    return cmd
+
+  def _adb(self, *args):
+    """Runs the adb command."""
+    return self._run_cmd(self._get_adb_cmd(*args))
 
   def _adb_shell(self, *args):
-    cmd = ['shell']
-    cmd.extend(args)
-    return self._adb(*cmd)
+    """Runs the adb shell command."""
+    # We are not using self._adb() because adb shell return 0 even if the
+    # command has failed. This method is taking care of checking the actual
+    # return code of the command line ran on the device.
+    RETURN_CODE_PREFIX = '%%%s%% ' % __file__
+    adb_cmd = self._get_adb_cmd('shell', '(%s); echo %s$?' % (
+        subprocess.list2cmdline(args), RETURN_CODE_PREFIX))
+    process = subprocess.Popen(adb_cmd, stdout=subprocess.PIPE)
+    adb_stdout, _ = process.communicate()
+    if process.returncode != 0:
+      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)
+    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)
     return self._adb_shell(*cmd)
@@ skipping 156 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())