| commit | d410c664e6e371f8b2ba32be75de2c4adfea3fb9 | [log] [tgz] |
|---|---|---|
| author | Ben Pastene <bpastene@chromium.org> | Wed Aug 26 17:07:03 2020 +0000 |
| committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Wed Aug 26 17:07:03 2020 +0000 |
| tree | 0cbcb836c5a53872c3d16db1103dc562da27fdf9 | |
| parent | c6aa15118046ed881094f1d97061bdb92ba7a149 [diff] [blame] |
gclient: Preserve ANSI color codes when calling hooks. If a hook prints error/warning output that's color-coded, gclient will cause the coloring to be disabled since those hooks aren't called directly from a terminal. By emulating a terminal when launching subprocs from gclient, we can convince them to keep the color escape codes. LED builds with both //third_party/depot_tools rolled to this CL, as well as depot_tools in the recipe bundle rolled to this CL: linux: https://ci.chromium.org/swarming/task/4e40237985888310 mac: https://ci.chromium.org/swarming/task/4e4023ea0c829710 win: https://ci.chromium.org/swarming/task/4e4024612e03dc10 Bug: 1034063 Change-Id: I4150f66ef215ece06f4c32482dcd4ded14eb1bfe Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2368435 Reviewed-by: Dirk Pranke <dpranke@google.com> Commit-Queue: Ben Pastene <bpastene@chromium.org>
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py index fae7a08..d5fafed 100755 --- a/tests/gclient_scm_test.py +++ b/tests/gclient_scm_test.py
@@ -1009,7 +1009,7 @@ self.options = BaseGitWrapperTestCase.OptionsObject() self.url = self.git_base + 'repo_1' self.mirror = None - mock.patch('sys.stdout').start() + mock.patch('sys.stdout', StringIO()).start() self.addCleanup(mock.patch.stopall) def setUpMirror(self): @@ -1122,7 +1122,7 @@ self.options = BaseGitWrapperTestCase.OptionsObject() self.url = self.git_base + 'repo_1' self.mirror = None - mock.patch('sys.stdout').start() + mock.patch('sys.stdout', StringIO()).start() self.addCleanup(mock.patch.stopall) def setUpMirror(self):