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/dependency_unittest.py

diff --git a/api/controller/dependency_unittest.py b/api/controller/dependency_unittest.py
index acd0370..eadae1e 100644
--- a/api/controller/dependency_unittest.py
+++ b/api/controller/dependency_unittest.py
@@ -7,7 +7,6 @@
 import os
 
 from chromite.api import api_config
-from chromite.api.controller import controller_util
 from chromite.api.controller import dependency
 from chromite.api.gen.chromite.api import depgraph_pb2
 from chromite.api.gen.chromite.api import sysroot_pb2
@@ -126,10 +125,7 @@
             "GetBuildDependency",
             return_value=(self.json_deps, self.json_deps),
         )
-        pkg_mock = "package-CPV"
-        pkg_to_cpv = self.PatchObject(
-            controller_util, "PackageInfoToCPV", return_value=pkg_mock
-        )
+        pkg_atom = "chromeos-base/chromeos-chrome"
         package = common_pb2.PackageInfo(
             package_name="chromeos-chrome", category="chromeos-base"
         )
@@ -141,8 +137,7 @@
             input_proto, self.response, self.api_config
         )
         self.assertEqual(self.response.dep_graph.build_target.name, "deathstar")
-        pkg_to_cpv.assert_called_once_with(package)
-        get_dep.assert_called_once_with("/build/target", "target", (pkg_mock,))
+        get_dep.assert_called_once_with("/build/target", "target", (pkg_atom,))
 
     def testValidateOnly(self):
         """Test that a validate only call does not execute any logic."""