| commit | ac3b9500c408a4ad05a51c52beb8f9d1584c2c04 | [log] [tgz] |
|---|---|---|
| author | Junji Watanabe <jwata@google.com> | Thu Jun 03 07:47:13 2021 |
| committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Thu Jun 03 07:47:13 2021 |
| tree | 9b60111c061177137cae7de2073fddceb265a161 | |
| parent | 7dc2c0f185d4658828933b0dcba6daacf2934792 [diff] |
add universal_newlines=True in KillADB() This fixes https://console.cloud.google.com/errors/CLH79JmVktryMg?time=P1D&project=chromium-swarm-dev Bug: 1198820 Change-Id: Id4041a93f17ef5d513b5e7587d051883d37b6fef Reviewed-on: https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2936244 Auto-Submit: Junji Watanabe <jwata@google.com> Commit-Queue: Takuto Ikuta <tikuta@chromium.org> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
diff --git a/adb/contrib/adb_commands_safe.py b/adb/contrib/adb_commands_safe.py index b8791fc..aa3bab2 100644 --- a/adb/contrib/adb_commands_safe.py +++ b/adb/contrib/adb_commands_safe.py
@@ -75,7 +75,9 @@ time.sleep(0.001) try: - processes = subprocess.check_output(['ps', 'aux']).splitlines() + processes = subprocess.check_output( + ['ps', 'aux'], + universal_newlines=True).splitlines() except subprocess.CalledProcessError: _LOG.error('KillADB(): unable to scan process list.') processes = []