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

diff --git a/api/controller/controller_util_unittest.py b/api/controller/controller_util_unittest.py
index 22b207f..d4dcdaa 100644
--- a/api/controller/controller_util_unittest.py
+++ b/api/controller/controller_util_unittest.py
@@ -13,9 +13,9 @@
 from chromite.api.gen.chromite.api import build_api_test_pb2
 from chromite.api.gen.chromite.api import sysroot_pb2
 from chromite.api.gen.chromiumos import common_pb2
-from chromite.lib import cros_test_lib
-from chromite.lib import portage_util
 from chromite.lib import build_target_lib
+from chromite.lib import cros_test_lib
+from chromite.lib.parser import package_info
 from chromite.lib.chroot_lib import Chroot
 
 
@@ -116,7 +116,7 @@
   def testAllFields(self):
     """Test handling when all fields present."""
     pi = common_pb2.PackageInfo()
-    cpv = portage_util.SplitCPV('cat/pkg-2.0.0', strict=False)
+    cpv = package_info.SplitCPV('cat/pkg-2.0.0', strict=False)
 
     controller_util.CPVToPackageInfo(cpv, pi)
     self.assertEqual('cat', pi.category)
@@ -126,7 +126,7 @@
   def testNoVersion(self):
     """Test handling when no version given."""
     pi = common_pb2.PackageInfo()
-    cpv = portage_util.SplitCPV('cat/pkg', strict=False)
+    cpv = package_info.SplitCPV('cat/pkg', strict=False)
 
     controller_util.CPVToPackageInfo(cpv, pi)
     self.assertEqual('cat', pi.category)
@@ -136,7 +136,7 @@
   def testPackageOnly(self):
     """Test handling when only given the package name."""
     pi = common_pb2.PackageInfo()
-    cpv = portage_util.SplitCPV('pkg', strict=False)
+    cpv = package_info.SplitCPV('pkg', strict=False)
 
     controller_util.CPVToPackageInfo(cpv, pi)
     self.assertEqual('', pi.category)
@@ -227,13 +227,13 @@
     ]
 
     for case in cases:
-      cpv = portage_util.SplitCPV(case, strict=False)
+      cpv = package_info.SplitCPV(case, strict=False)
       # We should end up with as much info as is available, so we should see
       # the original value in each case.
       self.assertEqual(case, controller_util.CPVToString(cpv))
 
   def testInvalidCPV(self):
     """Test invalid CPV object."""
-    cpv = portage_util.SplitCPV('', strict=False)
+    cpv = package_info.SplitCPV('', strict=False)
     with self.assertRaises(ValueError):
       controller_util.CPVToString(cpv)