commit 42c330e36386d8521e450647f0dae656430586f4
author Michael Mortensen <mmortensen@google.com> Wed Sep 02 09:59:16 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Sep 02 23:07:03 2020 +0000
tree 8c7f8c9003b1e04555c78a4f0738525c85aa42a6
parent dcb0e91ca94b1c500a5b57ac89c0aba8ce26fcc5

BuildAPI: Use optional packages in Packages.GetTargetVersions.

Ran api/compile_build_api_proto.

BUG=chromium:1123192
TEST=manual, run_tests

Change-Id: I6400a72da12d0e5e1303d46001ae5af2ea70b88f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2390842
Tested-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>

api/controller/packages.py

diff --git a/api/controller/packages.py b/api/controller/packages.py
index fa5500f..a33d72e 100644
--- a/api/controller/packages.py
+++ b/api/controller/packages.py
@@ -179,7 +179,16 @@
 
   # TODO(crbug/1019770): Investigate cases where builds_chrome is true but
   # chrome_version is None.
-  builds_chrome = packages.builds(constants.CHROME_CP, build_target)
+
+  # If input_proto.packages is empty, then the default set of packages will
+  # be used as defined in dependency.GetBuildDependency.
+  package_list = None
+  if input_proto.packages:
+    package_list = [
+        controller_util.PackageInfoToCPV(x) for x in input_proto.packages
+    ]
+  builds_chrome = packages.builds(constants.CHROME_CP, build_target,
+                                  packages=package_list)
   if builds_chrome:
     # Chrome version fetch.
     chrome_version = packages.determine_chrome_version(build_target)

api/controller/packages_unittest.py

diff --git a/api/controller/packages_unittest.py b/api/controller/packages_unittest.py
index 3a69774..3998d45 100644
--- a/api/controller/packages_unittest.py
+++ b/api/controller/packages_unittest.py
@@ -467,6 +467,61 @@
     # Verify call to determine_android_target passes a board name.
     android_target_mock.assert_called_with('betty')
 
+  def testGetTargetVersionsWithPackagesSet(self):
+    """Verify packages pass through and basic return values."""
+    # TODO(crbug.com/1124393): Migrate this test to use portage_testables
+    # rather than mocking the boundary to portage calls such as
+    # packages_service.builds).
+    builds_mock = self.PatchObject(packages_service, 'builds',
+                                   return_value=True)
+    # Mock that chrome is built and set the chrome_version.
+    chrome_version = '76.0.1.2'
+    self.PatchObject(packages_service, 'determine_chrome_version',
+                     return_value=chrome_version)
+    android_version = 'android_test_version'
+    self.PatchObject(packages_service, 'determine_android_version',
+                     return_value=android_version)
+    android_branch = 'android_test_branch'
+    self.PatchObject(packages_service, 'determine_android_branch',
+                     return_value=android_branch)
+    android_target = 'android_test_target'
+    self.PatchObject(packages_service, 'determine_android_target',
+                     return_value=android_target)
+    platform_version = '12345.1.2'
+    self.PatchObject(packages_service, 'determine_platform_version',
+                     return_value=platform_version)
+    milestone_version = '79'
+    self.PatchObject(packages_service, 'determine_milestone_version',
+                     return_value=milestone_version)
+    full_version = 'R79-12345.1.2'
+    self.PatchObject(packages_service, 'determine_full_version',
+                     return_value=full_version)
+    request = self._GetRequest(board='betty')
+    # Add optional packages to the request.
+    cpv_package_list = []
+    package = request.packages.add()
+    package.package_name = 'test'
+    package.category = 'chromeos-base'
+    package.version = '0.0.1-r1'
+    cpv_package_list.append(controller_util.PackageInfoToCPV(package))
+    package = request.packages.add()
+    package.package_name = 'target-fuzzers'
+    package.category = 'virtual'
+    cpv_package_list.append(controller_util.PackageInfoToCPV(package))
+
+    packages_controller.GetTargetVersions(request, self.response,
+                                          self.api_config)
+    self.assertEqual(self.response.android_version, android_version)
+    self.assertEqual(self.response.android_branch_version, android_branch)
+    self.assertEqual(self.response.android_target_version, android_target)
+    self.assertEqual(self.response.chrome_version, chrome_version)
+    self.assertEqual(self.response.platform_version, platform_version)
+    self.assertEqual(self.response.milestone_version, milestone_version)
+    # Verify call to packages.builds passes the package list.
+    builds_mock.assert_called_with(constants.CHROME_CP,
+                                   mock.ANY,  # Match the build target object
+                                   packages=cpv_package_list)
+
   def testGetTargetVersionNoAndroidNoChrome(self):
     """Verify return values on a board that does not have android."""
     platform_version = '12345.1.2'