commit 18a60afa41f69297e448e475dc0f2a06cb847d4b
author Alex Klein <saklein@chromium.org> Thu Jun 11 12:08:47 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Sep 22 17:03:44 2020 +0000
tree c9627d2a28d27600f032f6d2f4377de9d11d3c0f
parent ecea5b57d9dc83641a1ccf72a8e267b2633b45a3

portage_util.SplitCPV: convert usages to new parser lib.

BUG=chromium:1077379
TEST=run_pytest

Change-Id: Icab78423deef2917ac6dd6e1428c2b993b4176c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2241585
Tested-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Michael Mortensen <mmortensen@google.com>

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index 4a8ddfd..0c63c23 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -24,8 +24,8 @@
 from chromite.lib import cros_build_lib
 from chromite.lib import image_lib
 from chromite.lib import osutils
-from chromite.lib import portage_util
 from chromite.lib import sysroot_lib
+from chromite.lib.parser import package_info
 from chromite.scripts import cros_set_lsb_release
 from chromite.service import test
 from chromite.utils import key_value_store
@@ -72,10 +72,10 @@
 def _BuildTargetUnitTestFailedResponse(_input_proto, output_proto, _config):
   """Add failed packages to a failed response."""
   packages = ['foo/bar', 'cat/pkg']
-  failed_cpvs = [portage_util.SplitCPV(p, strict=False) for p in packages]
+  failed_cpvs = [package_info.SplitCPV(p, strict=False) for p in packages]
   for cpv in failed_cpvs:
-    package_info = output_proto.failed_packages.add()
-    controller_util.CPVToPackageInfo(cpv, package_info)
+    package_info_msg = output_proto.failed_packages.add()
+    controller_util.CPVToPackageInfo(cpv, package_info_msg)
 
 
 @faux.success(_BuildTargetUnitTestResponse)
@@ -97,14 +97,14 @@
   # Packages to be tested.
   packages_package_info = input_proto.packages
   packages = []
-  for package_info in packages_package_info:
-    packages.append(controller_util.PackageInfoToString(package_info))
+  for package_info_msg in packages_package_info:
+    packages.append(controller_util.PackageInfoToString(package_info_msg))
 
   # Skipped tests.
   blacklisted_package_info = input_proto.package_blacklist
   blacklist = []
-  for package_info in blacklisted_package_info:
-    blacklist.append(controller_util.PackageInfoToString(package_info))
+  for package_info_msg in blacklisted_package_info:
+    blacklist.append(controller_util.PackageInfoToString(package_info_msg))
 
   # Allow call to succeed if no tests were found.
   testable_packages_optional = input_proto.flags.testable_packages_optional
@@ -127,8 +127,8 @@
     # Failed to run tests or some tests failed.
     # Record all failed packages.
     for cpv in result.failed_cpvs:
-      package_info = output_proto.failed_packages.add()
-      controller_util.CPVToPackageInfo(cpv, package_info)
+      package_info_msg = output_proto.failed_packages.add()
+      controller_util.CPVToPackageInfo(cpv, package_info_msg)
     if result.failed_cpvs:
       return controller.RETURN_CODE_UNSUCCESSFUL_RESPONSE_AVAILABLE
     else: