commit 876a8e594992f4864ee9b7f97053c92a4495bb2c
author Mike Frysinger <vapier@chromium.org> Thu Jun 23 18:07:30 2022 -0400
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 01 17:54:09 2022 +0000
tree 814d2c76173755a9e358c85594958111c8e5e31f
parent 8310ad7cc82be612c476ab5af65ec8c921479400

cli/scripts: more cros_build_lib.run API migrations

BUG=b:187789262
TEST=CQ passes

Change-Id: Idcc78ccfe14fdbae89ae7573d6e78036bdacf8ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3738519
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ram Chandrasekar <rchandrasekar@google.com>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Ram Chandrasekar <rchandrasekar@google.com>

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index 27c755a..bc792e2 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -152,7 +152,7 @@
 
   def _GetRemoteMountFree(self, remote_dir):
     result = self.device.run(DF_COMMAND % remote_dir)
-    line = result.output.splitlines()[1]
+    line = result.stdout.splitlines()[1]
     value = line.split()[3]
     multipliers = {
         'G': 1024 * 1024 * 1024,
@@ -164,13 +164,13 @@
   def _GetRemoteDirSize(self, remote_dir):
     result = self.device.run('du -ks %s' % remote_dir,
                              capture_output=True, encoding='utf-8')
-    return int(result.output.split()[0])
+    return int(result.stdout.split()[0])
 
   def _GetStagingDirSize(self):
     result = cros_build_lib.dbg_run(['du', '-ks', self.staging_dir],
                                     stdout=True, capture_output=True,
                                     encoding='utf-8')
-    return int(result.output.split()[0])
+    return int(result.stdout.split()[0])
 
   def _ChromeFileInUse(self):
     result = self.device.run(LSOF_COMMAND_CHROME % (self.options.target_dir,),
@@ -219,12 +219,12 @@
       result = self.device.run('status ui', capture_output=True,
                                encoding='utf-8')
     except cros_build_lib.RunCommandError as e:
-      if 'Unknown job' in e.result.error:
+      if 'Unknown job' in e.result.stderr:
         return False
       else:
         raise e
 
-    return result.output.split()[1].split('/')[0] == 'start'
+    return result.stdout.split()[1].split('/')[0] == 'start'
 
   def _KillLacrosChrome(self):
     """This method kills lacros-chrome on the device, if it's running."""
@@ -373,7 +373,7 @@
     if r.returncode != 0:
       raise DeployFailure('Unable to ls contents of %s' % _CHROME_TEST_BIN_DIR)
     binaries_to_copy = []
-    for f in r.output.splitlines():
+    for f in r.stdout.splitlines():
       binaries_to_copy.append(
           chrome_util.Path(os.path.basename(f), exe=True, optional=True))