commit 7a580c1644bb041fd9e7a129b6cd5029aa107e25
author Mike Frysinger <vapier@chromium.org> Mon Aug 01 21:45:41 2022 -0400
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 02 15:58:32 2022 +0000
tree 703ca8a4bdace02f9a9a4c60b172fa70ddd97d3f
parent c585a191fe4a5945fe277daa7e51c119b32af6a2

cros_build_lib: run: convert a few more .output/.error usage

BUG=b:187789262
TEST=CQ passes

Change-Id: I0db910515a674af43ef36e8611c92ecd2f3205ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3804006
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Cindy Lin <xcl@google.com>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Cindy Lin <xcl@google.com>

cli/command_vm_test.py

diff --git a/cli/command_vm_test.py b/cli/command_vm_test.py
index 2d98c7d..f9b823a 100644
--- a/cli/command_vm_test.py
+++ b/cli/command_vm_test.py
@@ -130,7 +130,7 @@
                                 check=False)
     if result.returncode:
       logging.error('Failed to write the file to the VM device.')
-      raise CommandError(result.error)
+      raise CommandError(result.stderr)
 
     logging.info('Test to use shell command to read a file on the VM device.')
     read_cmd = cmd + ['--', 'cat %s' % path]
@@ -138,7 +138,7 @@
                                 check=False)
     if result.returncode or result.stdout.rstrip() != content:
       logging.error('Failed to read the file on the VM device.')
-      raise CommandError(result.error)
+      raise CommandError(result.stderr)
 
     logging.info('Test to use shell command to remove a file on the VM device.')
     remove_cmd = cmd + ['--', 'rm %s' % path]
@@ -146,7 +146,7 @@
                                 check=False)
     if result.returncode:
       logging.error('Failed to remove the file on the VM device.')
-      raise CommandError(result.error)
+      raise CommandError(result.stderr)
 
   @test_command_decorator('debug')
   def TestDebug(self):
@@ -159,7 +159,7 @@
                                 check=False, input='\n')
     if result.returncode:
       logging.error('Failed to start and debug a new process on the VM device.')
-      raise CommandError(result.error)
+      raise CommandError(result.stderr)
 
     logging.info('Test to attach a running process on the VM device.')
     with remote_access.ChromiumOSDeviceHandler(
@@ -176,7 +176,7 @@
                                   check=False, input='\n')
       if result.returncode:
         logging.error('Failed to attach a running process on the VM device.')
-        raise CommandError(result.error)
+        raise CommandError(result.stderr)
 
   @test_command_decorator('flash')
   def TestFlash(self):
@@ -192,7 +192,7 @@
     result = cros_build_lib.run(cmd, capture_output=True, check=False)
     if result.returncode:
       logging.error('Failed to flash the VM device.')
-      raise CommandError(result.error)
+      raise CommandError(result.stderr)
 
   @test_command_decorator('deploy')
   def TestDeploy(self):
@@ -210,7 +210,7 @@
 
     if result.returncode:
       logging.error('Failed to uninstall packages on the VM device.')
-      raise CommandError(result.error)
+      raise CommandError(result.stderr)
 
     captured_output = output.GetStdout() + output.GetStderr()
     for event in deploy.BrilloDeployOperation.UNMERGE_EVENTS:
@@ -226,7 +226,7 @@
 
     if result.returncode:
       logging.error('Failed to install packages on the VM device.')
-      raise CommandError(result.error)
+      raise CommandError(result.stderr)
 
     captured_output = output.GetStdout() + output.GetStderr()
     for event in deploy.BrilloDeployOperation.MERGE_EVENTS: