Merge branch 'aosp/mirror-chromium-master' into update_utils am: 4307f4735e am: 18caef1edd am: 6c551e0d52 am: ddfea1f7e7android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-dev

am: f1a93c225b

Change-Id: I60d258ddb8fd0bf9632f1f70c5cdeb3078938059

1 files changed, 65 insertions, 61 deletions

diff --git a/cros_utils/command_executer.py b/cros_utils/command_executer.py
index c5614513..ae1b2962 100644
--- a/cros_utils/command_executer.py
+++ b/cros_utils/command_executer.py
@@ -98,11 +98,13 @@ class CommandExecuter(object):
     # In this way the child cannot mess the parent's terminal.
     p = None
     try:
-      p = subprocess.Popen(cmd,
-                           stdout=subprocess.PIPE,
-                           stderr=subprocess.PIPE,
-                           shell=True,
-                           preexec_fn=os.setsid)
+      p = subprocess.Popen(
+          cmd,
+          stdout=subprocess.PIPE,
+          stderr=subprocess.PIPE,
+          shell=True,
+          preexec_fn=os.setsid,
+          executable='/bin/bash')
 
       full_stdout = ''
       full_stderr = ''
@@ -156,8 +158,7 @@ class CommandExecuter(object):
             if self.logger:
               self.logger.LogWarning('Timeout of %s seconds reached since '
                                      'process termination.' %
-                                     terminated_timeout,
-                                     print_to_console)
+                                     terminated_timeout, print_to_console)
             break
 
         if (command_timeout is not None and
@@ -277,14 +278,15 @@ class CommandExecuter(object):
 
     # Write all commands to a file.
     command_file = self.WriteToTempShFile(cmd)
-    retval = self.CopyFiles(command_file,
-                            command_file,
-                            dest_machine=machine,
-                            command_terminator=command_terminator,
-                            chromeos_root=chromeos_root,
-                            dest_cros=True,
-                            recursive=False,
-                            print_to_console=print_to_console)
+    retval = self.CopyFiles(
+        command_file,
+        command_file,
+        dest_machine=machine,
+        command_terminator=command_terminator,
+        chromeos_root=chromeos_root,
+        dest_cros=True,
+        recursive=False,
+        print_to_console=print_to_console)
     if retval:
       if self.logger:
         self.logger.LogError('Could not run remote command on machine.'
@@ -294,12 +296,13 @@ class CommandExecuter(object):
     command = self.RemoteAccessInitCommand(chromeos_root, machine)
     command += '\nremote_sh bash %s' % command_file
     command += "\nl_retval=$?; echo \"$REMOTE_OUT\"; exit $l_retval"
-    retval = self.RunCommandGeneric(command,
-                                    return_output,
-                                    command_terminator=command_terminator,
-                                    command_timeout=command_timeout,
-                                    terminated_timeout=terminated_timeout,
-                                    print_to_console=print_to_console)
+    retval = self.RunCommandGeneric(
+        command,
+        return_output,
+        command_terminator=command_terminator,
+        command_timeout=command_timeout,
+        terminated_timeout=terminated_timeout,
+        print_to_console=print_to_console)
     if return_output:
       connect_signature = (
           'Initiating first contact with remote host\n' + 'Connection OK\n')
@@ -368,8 +371,8 @@ class CommandExecuter(object):
     # the chroot already exists. We want the final returned output to skip
     # the output from chroot creation steps.
     if return_output:
-      ret = self.RunCommand('cd %s; cros_sdk %s -- true' %
-                            (chromeos_root, cros_sdk_options))
+      ret = self.RunCommand('cd %s; cros_sdk %s -- true' % (chromeos_root,
+                                                            cros_sdk_options))
       if ret:
         return (ret, '', '')
 
@@ -378,12 +381,13 @@ class CommandExecuter(object):
     command = ("cd %s; cros_sdk %s -- bash -c '%s/%s'" %
                (chromeos_root, cros_sdk_options, misc.CHROMEOS_SCRIPTS_DIR,
                 os.path.basename(command_file)))
-    ret = self.RunCommandGeneric(command,
-                                 return_output,
-                                 command_terminator=command_terminator,
-                                 command_timeout=command_timeout,
-                                 terminated_timeout=terminated_timeout,
-                                 print_to_console=print_to_console)
+    ret = self.RunCommandGeneric(
+        command,
+        return_output,
+        command_terminator=command_terminator,
+        command_timeout=command_timeout,
+        terminated_timeout=terminated_timeout,
+        print_to_console=print_to_console)
     os.remove(command_file)
     return ret
 
@@ -419,10 +423,11 @@ class CommandExecuter(object):
                   username=None,
                   command_terminator=None):
     cmd = ' ;\n'.join(cmdlist)
-    return self.RunCommand(cmd,
-                           machine=machine,
-                           username=username,
-                           command_terminator=command_terminator)
+    return self.RunCommand(
+        cmd,
+        machine=machine,
+        username=username,
+        command_terminator=command_terminator)
 
   def CopyFiles(self,
                 src,
@@ -464,18 +469,20 @@ class CommandExecuter(object):
       rsync_prefix = "\nrsync -r -e \"%s\" " % ssh_command
       if dest_cros == True:
         command += rsync_prefix + '%s root@%s:%s' % (src, dest_machine, dest)
-        return self.RunCommand(command,
-                               machine=src_machine,
-                               username=src_user,
-                               command_terminator=command_terminator,
-                               print_to_console=print_to_console)
+        return self.RunCommand(
+            command,
+            machine=src_machine,
+            username=src_user,
+            command_terminator=command_terminator,
+            print_to_console=print_to_console)
       else:
         command += rsync_prefix + 'root@%s:%s %s' % (src_machine, src, dest)
-        return self.RunCommand(command,
-                               machine=dest_machine,
-                               username=dest_user,
-                               command_terminator=command_terminator,
-                               print_to_console=print_to_console)
+        return self.RunCommand(
+            command,
+            machine=dest_machine,
+            username=dest_user,
+            command_terminator=command_terminator,
+            print_to_console=print_to_console)
 
     if dest_machine == src_machine:
       command = 'rsync -a %s %s' % (src, dest)
@@ -484,11 +491,12 @@ class CommandExecuter(object):
         src_machine = os.uname()[1]
         src_user = getpass.getuser()
       command = 'rsync -a %s@%s:%s %s' % (src_user, src_machine, src, dest)
-    return self.RunCommand(command,
-                           machine=dest_machine,
-                           username=dest_user,
-                           command_terminator=command_terminator,
-                           print_to_console=print_to_console)
+    return self.RunCommand(
+        command,
+        machine=dest_machine,
+        username=dest_user,
+        command_terminator=command_terminator,
+        print_to_console=print_to_console)
 
   def RunCommand2(self,
                   cmd,
@@ -557,9 +565,8 @@ class CommandExecuter(object):
       def notify_line(self):
         p = self._buf.find('\n')
         while p >= 0:
-          self._line_consumer(line=self._buf[:p + 1],
-                              output=self._name,
-                              pobject=self._pobject)
+          self._line_consumer(
+              line=self._buf[:p + 1], output=self._name, pobject=self._pobject)
           if p < len(self._buf) - 1:
             self._buf = self._buf[p + 1:]
             p = self._buf.find('\n')
@@ -571,9 +578,8 @@ class CommandExecuter(object):
       def notify_eos(self):
         # Notify end of stream. The last line may not end with a '\n'.
         if self._buf != '':
-          self._line_consumer(line=self._buf,
-                              output=self._name,
-                              pobject=self._pobject)
+          self._line_consumer(
+              line=self._buf, output=self._name, pobject=self._pobject)
           self._buf = ''
 
     if self.log_level == 'verbose':
@@ -605,15 +611,13 @@ class CommandExecuter(object):
       poll = select.poll()
       outfd = pobject.stdout.fileno()
       poll.register(outfd, select.POLLIN | select.POLLPRI)
-      handlermap = {outfd:
-                    StreamHandler(pobject, outfd, 'stdout', line_consumer)}
+      handlermap = {
+          outfd: StreamHandler(pobject, outfd, 'stdout', line_consumer)
+      }
       if not join_stderr:
         errfd = pobject.stderr.fileno()
-        poll.register(errfd,
-                      select.POLLIN | select.POLLPRI)
-        handlermap[errfd] = StreamHandler(pobject,
-                                          errfd,
-                                          'stderr',
+        poll.register(errfd, select.POLLIN | select.POLLPRI)
+        handlermap[errfd] = StreamHandler(pobject, errfd, 'stderr',
                                           line_consumer)
       while len(handlermap):
         readables = poll.poll(300)