commit 8e14eb1bb14a1b1c958c0b68991c6fb07da702c4
author Benjamin Shai <bshai@google.com> Thu Apr 28 22:55:16 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 05 20:23:55 2022 +0000
tree 07a5bc0f15a4e6bb370bfddaa7fdc86e33b59720
parent e9754a3aece86a50e6cc3f28a13bf79ce8edc155

package-service: add support for alternative kernel patterns

Some boards (e.g. beaglebone) use their own custom kernel, and as such
are not being caught by `determine_kernel_version`. Add logic to support
their kernel, as well as changing the signature of the method to not
return `None` (because the proto field doesn't support None).

BUG=None
TEST=unit-test

Change-Id: Icb2218c3df7b8203eb5b3a7e9862f4d011687511
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3615656
Reviewed-by: George Engelbrecht <engeg@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Benjamin Shai <bshai@google.com>
Commit-Queue: Benjamin Shai <bshai@google.com>

api/controller/packages_unittest.py

diff --git a/api/controller/packages_unittest.py b/api/controller/packages_unittest.py
index a56679e..314d433 100644
--- a/api/controller/packages_unittest.py
+++ b/api/controller/packages_unittest.py
@@ -557,10 +557,8 @@
                                            return_value=android_target)
     self.PatchObject(portage_util, 'GetBoardUseFlags',
                      return_value=['arc', 'arcvm', 'big_little', 'cheets'])
-    package_result = ['sys-kernel/linux-headers-4.14-r24',
-                      'sys-devel/flex-2.6.4-r1',
-                      'sys-kernel/chromeos-kernel-4_4-4.4.223-r2209']
-    self.PatchObject(portage_util, 'GetPackageDependencies',
+    package_result = ['sys-kernel/chromeos-kernel-4_4-4.4.223-r2209']
+    self.PatchObject(portage_util, 'GetFlattenedDepsForPackage',
                      return_value=package_result)
 
     fw_versions = packages_service.FirmwareVersions(