commit d3b8404adb9b9b82efbcb33d1f3263323ff364e6
author Alex Klein <saklein@chromium.org> Fri May 19 14:43:59 2023 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat May 27 03:03:15 2023 +0000
tree 004e56b7e17f7090a05c8740a9bea0bcbbcf7bd6
parent ace4eaeeab6e370398070b2b49cb5eee496190af

api: Drop controller_util.PackageInfoToCpv.

Convert remaining usages of PackageInfoToCpv to
deserialize_package_info to allow dropping the SplitCPV usage.

BUG=b:187792048
TEST=run_tests, CQ

Change-Id: I90f48ce1d728bc077dbb6dac1807cb4468f0a8f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4548373
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>

api/controller/packages_unittest.py

diff --git a/api/controller/packages_unittest.py b/api/controller/packages_unittest.py
index 30a5f50..a4a99db 100644
--- a/api/controller/packages_unittest.py
+++ b/api/controller/packages_unittest.py
@@ -513,16 +513,16 @@
         )
         request = self._GetRequest(board="betty")
         # Add optional packages to the request.
-        cpv_package_list = []
+        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_list.append(controller_util.deserialize_package_info(package))
         package = request.packages.add()
         package.package_name = "target-fuzzers"
         package.category = "virtual"
-        cpv_package_list.append(controller_util.PackageInfoToCPV(package))
+        package_list.append(controller_util.deserialize_package_info(package))
 
         packages_controller.GetTargetVersions(
             request, self.response, self.api_config
@@ -537,12 +537,8 @@
         # Verify call to packages.builds passes the package list.
         builds_mock.assert_has_calls(
             calls=[
-                mock.call(
-                    constants.CHROME_CP, mock.ANY, packages=cpv_package_list
-                ),
-                mock.call(
-                    constants.LACROS_CP, mock.ANY, packages=cpv_package_list
-                ),
+                mock.call(constants.CHROME_CP, mock.ANY, packages=package_list),
+                mock.call(constants.LACROS_CP, mock.ANY, packages=package_list),
             ]
         )
 
@@ -1035,7 +1031,7 @@
         patch.assert_called_once_with(
             constants.CHROME_CP,
             build_target_lib.BuildTarget("foo"),
-            [controller_util.PackageInfoToCPV(package)],
+            [controller_util.deserialize_package_info(package)],
         )