Revert "deploy: Refactor SplitCPV to parse."
This reverts commit c05aa52a5a9d3b4a53557e64ed1866bdb2002b45.
Reason for revert: Suspected source of breakage for crbug.com/1137279
Original change's description:
> deploy: Refactor SplitCPV to parse.
>
> BUG=chromium:1077379
> TEST=./run_pytest
>
> Change-Id: I24767419a9317acd8fb153fe9786c81a17bdfee6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2458696
> Tested-by: Alex Klein <saklein@chromium.org>
> Reviewed-by: Michael Mortensen <mmortensen@google.com>
> Commit-Queue: Alex Klein <saklein@chromium.org>
Bug: chromium:1077379, chromium:1137279
Change-Id: Id0b50260283ab3d019fb7be3c3191e676f4ad0df
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2466327
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
diff --git a/cli/deploy_unittest.py b/cli/deploy_unittest.py
index bb0f6ac..bb4500e 100644
--- a/cli/deploy_unittest.py
+++ b/cli/deploy_unittest.py
@@ -342,7 +342,7 @@
# Check that package names were correctly resolved into binary packages.
self.get_packages_paths.assert_called_once_with(
- [package_info.parse(p) for p in cpvs], True, 'sysroot')
+ [package_info.SplitCPV(p) for p in cpvs], True, 'sysroot')
# Check that deploy._Emerge is called the right number of times.
self.assertEqual(self.emerge.call_count, len(packages))
self.assertEqual(self.unmerge.call_count, 0)
@@ -388,7 +388,7 @@
# Check that package names were correctly resolved into binary packages.
self.get_packages_paths.assert_called_once_with(
- [package_info.parse(p) for p in cpvs], True, 'sysroot')
+ [package_info.SplitCPV(p) for p in cpvs], True, 'sysroot')
# Check that deploy._Emerge is called the right number of times.
self.assertEqual(self.emerge.call_count, len(packages))
self.assertEqual(self.unmerge.call_count, 0)