commit bad755b5e1159f1a7775567f2f85ff7281e64187
author Achuith Bhandarkar <achuith@chromium.org> Sat Jun 09 16:05:01 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Sun Jun 10 15:09:28 2018 -0700
tree 2938af05993ac027e88ed48d1dbe59d9d9197736
parent a3262ecbffe55bca7d89c90858aa800b1903a263

cros_run_vm_test: Fix breakage due to revert.

Revert of CL:1091183 broke cros_run_vm_test.

Use stream_log for stream_output.

BUG=chromium:829481
TEST=manual

Change-Id: If562478245e8951ab42d2fbef4fe4a2ccc6a3fb9
Reviewed-on: https://chromium-review.googlesource.com/1094489
Commit-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>

scripts/cros_vm.py

diff --git a/scripts/cros_vm.py b/scripts/cros_vm.py
index 7da6628..d5e2559 100644
--- a/scripts/cros_vm.py
+++ b/scripts/cros_vm.py
@@ -414,22 +414,25 @@
     if not self.enable_kvm:
       self._WaitForProcs()
 
-  def RemoteCommand(self, cmd, **kwargs):
+  def RemoteCommand(self, cmd, stream_output=False, **kwargs):
     """Run a remote command in the VM.
 
     Args:
       cmd: command to run.
+      stream_output: Stream output of long-running commands.
       kwargs: additional args (see documentation for RemoteDevice.RunCommand).
 
     Returns:
       cros_build_lib.CommandResult object.
     """
     if not self.dry_run:
-      return self.remote.RunCommand(cmd, debug_level=logging.INFO,
-                                    combine_stdout_stderr=True,
-                                    log_output=True,
-                                    error_code_ok=True,
-                                    **kwargs)
+      kwargs.setdefault('error_code_ok', True)
+      if stream_output:
+        kwargs.setdefault('capture_output', False)
+      else:
+        kwargs.setdefault('combine_stdout_stderr', True)
+        kwargs.setdefault('log_output', True)
+      return self.remote.RunCommand(cmd, debug_level=logging.INFO, **kwargs)
 
   @staticmethod
   def GetParser():