commit 4d7093dd6d1441fbc49e61e94d5912307f1436bb
author Jian Cai <jiancai@google.com> Wed Aug 19 12:00:45 2020 -0700
committer Jian Cai <jiancai@google.com> Wed Aug 19 21:04:44 2020 +0000
tree bfa652a7b0f48c1701f81dcf4ca24e6e21d34ff1
parent 98de93b00a543825e7c90477eb0808e9fe9b4c55

cros_utils: clean up naming

Also fixed format to comply with yapf.

BUG=chromium:1099035
TEST=None.

Change-Id: I341ee97c2270f33548590daadb36050c2a6baaf6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2364722
Reviewed-by: Tiancong Wang <tcwang@google.com>
Tested-by: Jian Cai <jiancai@google.com>

cros_utils/buildbot_utils.py

diff --git a/cros_utils/buildbot_utils.py b/cros_utils/buildbot_utils.py
index e0c5478..b600c6a 100644
--- a/cros_utils/buildbot_utils.py
+++ b/cros_utils/buildbot_utils.py
@@ -50,8 +50,8 @@
                   and url looks like:
     gs://chromeos-image-archive/trybot-elm-release-tryjob/R67-10468.0.0-b20789
   """
-  command = (
-      'cros buildresult --report json --buildbucket-id %s' % buildbucket_id)
+  command = ('cros buildresult --report json --buildbucket-id %s' %
+             buildbucket_id)
   rc, out, _ = RunCommandInPath(chromeos_root, command)
 
   # Current implementation of cros buildresult returns fail when a job is still
@@ -194,9 +194,9 @@
     image = ''
 
   if not image:
-    logger.GetLogger().LogError(
-        'Trybot job (buildbucket id: %s) failed with'
-        'status %s; no trybot image generated. ' % (buildbucket_id, status))
+    logger.GetLogger().LogError('Trybot job (buildbucket id: %s) failed with'
+                                'status %s; no trybot image generated. ' %
+                                (buildbucket_id, status))
   else:
     # Convert full gs path to what crosperf expects. For example, convert
     # gs://chromeos-image-archive/trybot-elm-release-tryjob/R67-10468.0.0-b20789
@@ -226,13 +226,13 @@
   while elapsed_time < TIME_OUT:
     if DoesImageExist(chromeos_root, build):
       return
-    logger.GetLogger().LogOutput(
-        'Image %s not ready, waiting for 10 minutes' % build)
+    logger.GetLogger().LogOutput('Image %s not ready, waiting for 10 minutes' %
+                                 build)
     time.sleep(SLEEP_TIME)
     elapsed_time += SLEEP_TIME
 
-  logger.GetLogger().LogOutput(
-      'Image %s not found, waited for %d hours' % (build, (TIME_OUT / 3600)))
+  logger.GetLogger().LogOutput('Image %s not found, waited for %d hours' %
+                               (build, (TIME_OUT / 3600)))
   raise BuildbotTimeout('Timeout while waiting for image %s' % build)
 
 
@@ -253,7 +253,7 @@
   candidates.sort(reverse=True)
   for c in candidates:
     build = '%s/R%d-%d.%d.%d' % (path, c[0], c[1], c[2], c[3])
-    # Blacklist "R79-12384.0.0" image released by mistake.
+    # Denylist "R79-12384.0.0" image released by mistake.
     # TODO(crbug.com/992242): Remove the filter by 2019-09-05.
     if c == [79, 12384, 0, 0]:
       continue