commit 66d32cd8f21c9707e07a52daf0c72d85d531aaa5
author Mike Frysinger <vapier@chromium.org> Tue Dec 17 14:55:29 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Thu Dec 19 06:22:51 2019 +0000
tree cbae76dc74d76b17c16f7c293def290995594a8a
parent d8a12595a9a2df4524f872c0a37ba99597398dfd

cros_build_lib.run: clean up combine_stdout_stderr->stderr migration

BUG=chromium:1006587
TEST=`./run_tests` passes

Change-Id: I813459822507840e9c57f1891fbf067573b5e7df
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1972672
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>

scripts/cros_sdk_unittest.py

diff --git a/scripts/cros_sdk_unittest.py b/scripts/cros_sdk_unittest.py
index d2632ac..a3f48d7 100644
--- a/scripts/cros_sdk_unittest.py
+++ b/scripts/cros_sdk_unittest.py
@@ -8,6 +8,7 @@
 from __future__ import print_function
 
 import os
+import subprocess
 import unittest
 
 from chromite.lib import cros_build_lib
@@ -119,7 +120,7 @@
     try:
       result = cros_build_lib.run(
           cmd, print_cmd=False, capture_output=True, check=False,
-          combine_stdout_stderr=True)
+          stderr=subprocess.STDOUT)
     except cros_build_lib.RunCommandError as e:
       raise SystemExit('Running %r failed!: %s' % (cmd, e))