commit 39e74d354c4259a43bbb0fc456305dc395a44665
author Trent Apted <tapted@chromium.org> Mon Sep 04 11:24:40 2023 +1000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 07 05:22:02 2023 +0000
tree 156de093b9d86d0a5567c5dc65bfcd386527b259
parent f37ae13aa9c03a314c913d09a405887dc1ce1f9d

Fix some lint warnings in chromite.

This picked up tiny bit of dead code in fwbuddy.py that is resolved by
adding `check=False` so that cros_build_lib.run doesn't throw an
exception for non-zero command return codes.

With this, the following command reports no errors:

cros lint --exclude="contrib/*" --exclude='third_party/*' \
    --exclude="sdk/bin/*" --include='*.py' --exclude="*" .

BUG=b:298875552
TEST=CQ

Change-Id: Ic8121e8a438669c8ecb2a883bfa5c4d7f3430057
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4835735
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Tested-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Sean Carpenter <seancarpenter@google.com>

api/controller/toolchain_unittest.py

diff --git a/api/controller/toolchain_unittest.py b/api/controller/toolchain_unittest.py
index 1f4332a..139ebc8 100644
--- a/api/controller/toolchain_unittest.py
+++ b/api/controller/toolchain_unittest.py
@@ -12,8 +12,8 @@
 from chromite.api.gen.chromite.api import artifacts_pb2
 from chromite.api.gen.chromite.api import sysroot_pb2
 from chromite.api.gen.chromite.api import toolchain_pb2
+from chromite.api.gen.chromiumos import builder_config_pb2
 from chromite.api.gen.chromiumos import common_pb2
-from chromite.api.gen.chromiumos.builder_config_pb2 import BuilderConfig
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_lib
 from chromite.lib import osutils
@@ -24,6 +24,8 @@
 
 # pylint: disable=protected-access
 
+BuilderConfig = builder_config_pb2.BuilderConfig
+
 
 class UpdateEbuildWithAFDOArtifactsTest(
     cros_test_lib.MockTestCase, api_config.ApiConfigMixin
@@ -463,12 +465,14 @@
         )
 
 
-class SetupToolchainsTest(cros_test_lib.MockTestCase,
-                          api_config.ApiConfigMixin):
+class SetupToolchainsTest(
+    cros_test_lib.MockTestCase, api_config.ApiConfigMixin
+):
     """Unit tests for ToolchainService.SetupToolchains."""
+
     def setUp(self) -> None:
         self.response = toolchain_pb2.SetupToolchainsResponse()
-        self.chroot = common_pb2.Chroot(path='/path/to/chroot')
+        self.chroot = common_pb2.Chroot(path="/path/to/chroot")
 
     def test_outside_chroot(self) -> None:
         """Test the behavior if run from outside the chroot."""
@@ -499,11 +503,13 @@
             boards=[
                 common_pb2.BuildTarget(name="amd64-generic"),
                 common_pb2.BuildTarget(name="arm-generic"),
-            ])
+            ],
+        )
         toolchain.SetupToolchains(
             request,
             self.response,
             self.api_config,
         )
         service_mock.assert_called_once_with(
-            include_boards=["amd64-generic", "arm-generic"], )
+            include_boards=["amd64-generic", "arm-generic"],
+        )