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_unittest.py

diff --git a/api/controller/test_unittest.py b/api/controller/test_unittest.py
index ca3f3c2..f3525b9 100644
--- a/api/controller/test_unittest.py
+++ b/api/controller/test_unittest.py
@@ -23,7 +23,7 @@
 from chromite.lib import cros_test_lib
 from chromite.lib import image_lib
 from chromite.lib import osutils
-from chromite.lib import portage_util
+from chromite.lib.parser import package_info
 from chromite.scripts import cros_set_lsb_release
 from chromite.service import test as test_service
 from chromite.utils import key_value_store
@@ -205,7 +205,7 @@
     expected = [('cat', 'pkg'), ('foo', 'bar')]
 
     result = test_service.BuildTargetUnitTestResult(1, None)
-    result.failed_cpvs = [portage_util.SplitCPV(p, strict=False) for p in pkgs]
+    result.failed_cpvs = [package_info.SplitCPV(p, strict=False) for p in pkgs]
     self.PatchObject(test_service, 'BuildTargetUnitTest', return_value=result)
 
     input_msg = self._GetInput(board='board', result_path=self.tempdir)
@@ -230,7 +230,7 @@
     self.PatchObject(test_service, 'BuildTargetUnitTest', return_value=result)
 
     pkgs = ['foo/bar', 'cat/pkg']
-    blacklist = [portage_util.SplitCPV(p, strict=False) for p in pkgs]
+    blacklist = [package_info.SplitCPV(p, strict=False) for p in pkgs]
     input_msg = self._GetInput(board='board', result_path=self.tempdir,
                                empty_sysroot=True, blacklist=blacklist)
     output_msg = self._GetOutput()
@@ -244,7 +244,7 @@
   def testBuildTargetUnitTest(self):
     """Test BuildTargetUnitTest successful call."""
     pkgs = ['foo/bar', 'cat/pkg']
-    packages = [portage_util.SplitCPV(p, strict=False) for p in pkgs]
+    packages = [package_info.SplitCPV(p, strict=False) for p in pkgs]
     input_msg = self._GetInput(
         board='board', result_path=self.tempdir, packages=packages)