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

diff --git a/api/controller/sysroot_unittest.py b/api/controller/sysroot_unittest.py
index 6f2b3fb..5f35fb4 100644
--- a/api/controller/sysroot_unittest.py
+++ b/api/controller/sysroot_unittest.py
@@ -21,8 +21,8 @@
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_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.service import sysroot as sysroot_service
 
 
@@ -236,10 +236,10 @@
       package_list = []
       for pkg in pkg_list:
         pkg_string_parts = pkg.split('/')
-        package_info = common_pb2.PackageInfo(
+        package_info_msg = common_pb2.PackageInfo(
             category=pkg_string_parts[0],
             package_name=pkg_string_parts[1])
-        package_list.append(package_info)
+        package_list.append(package_info_msg)
     else:
       package_list = []
 
@@ -410,7 +410,7 @@
                                 sysroot_path=self.sysroot)
 
     err_pkgs = ['cat/pkg', 'cat2/pkg2']
-    err_cpvs = [portage_util.SplitCPV(pkg, strict=False) for pkg in err_pkgs]
+    err_cpvs = [package_info.SplitCPV(pkg, strict=False) for pkg in err_pkgs]
     expected = [('cat', 'pkg'), ('cat2', 'pkg2')]
     err = sysroot_lib.ToolchainInstallError('Error',
                                             cros_build_lib.CommandResult(),
@@ -470,7 +470,7 @@
     if packages:
       for pkg in packages:
         pkg_info = instance.packages.add()
-        cpv = portage_util.SplitCPV(pkg, strict=False)
+        cpv = package_info.SplitCPV(pkg, strict=False)
         controller_util.CPVToPackageInfo(cpv, pkg_info)
     return instance
 
@@ -745,7 +745,7 @@
 
     # Failed package info and expected list for verification.
     err_pkgs = ['cat/pkg', 'cat2/pkg2']
-    err_cpvs = [portage_util.SplitCPV(cpv, strict=False) for cpv in err_pkgs]
+    err_cpvs = [package_info.SplitCPV(cpv, strict=False) for cpv in err_pkgs]
     expected = [('cat', 'pkg'), ('cat2', 'pkg2')]
 
     # Force error to be raised with the packages.