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>
diff --git a/api/controller/test.py b/api/controller/test.py
index 4231558..d42e3bb 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -94,17 +94,16 @@
was_built = not input_proto.flags.empty_sysroot
# Packages to be tested.
- packages_package_info = input_proto.packages
- packages = []
- for package_info_msg in packages_package_info:
- cpv = controller_util.PackageInfoToCPV(package_info_msg)
- packages.append(cpv.cp)
+ packages = [
+ controller_util.deserialize_package_info(x).atom
+ for x in input_proto.packages
+ ]
# Skipped tests.
- blocklisted_package_info = input_proto.package_blocklist
- blocklist = []
- for package_info_msg in blocklisted_package_info:
- blocklist.append(controller_util.PackageInfoToString(package_info_msg))
+ blocklist = [
+ controller_util.deserialize_package_info(x).atom
+ for x in input_proto.package_blocklist
+ ]
# Allow call to filter out non-cros_workon packages from the input packages.
filter_only_cros_workon = input_proto.flags.filter_only_cros_workon