commit d0db407331c4c4fb9981b9232b6536779b09461b
author Ned Nguyen <nednguyen@google.com> Fri Feb 22 14:19:21 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Feb 27 09:34:59 2019 -0800
tree bce98afba78f3fc3deb97119f05aeb379e9ef9cb
parent 9e7e84f5355474c55ecc0671d2901a32c8794657

cros deploy: simplify _GetPackagesPaths implementation

The |pkgs| variable passed into _GetPackagesPaths contain only cpvs*, so
simplify its implementation based on that.

*pkgs comes from pkg_scanner.Run(..), which supposed to return the cpvs
string (see cs/chromeos_public/chromite/cli/deploy.py?rcl=c08d404a452b5d55b99fb665ace0435ba4d6e198&l=679)

BUG=chromium:920140
TEST=unittest, run `cros deploy` locally

Change-Id: I93784b88f3d79436829270dec7dc1af4a3397ea0
Reviewed-on: https://chromium-review.googlesource.com/1484191
Commit-Ready: Ned Nguyen <nednguyen@google.com>
Tested-by: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

cli/deploy_unittest.py

diff --git a/cli/deploy_unittest.py b/cli/deploy_unittest.py
index cdd8afd..555decc 100644
--- a/cli/deploy_unittest.py
+++ b/cli/deploy_unittest.py
@@ -99,13 +99,14 @@
 class PackageScannerFake(object):
   """Fake for PackageScanner."""
 
-  def __init__(self, packages):
+  def __init__(self, packages, packages_cpvs=None):
     self.pkgs = packages
+    self.cpvs = packages_cpvs or packages
     self.listed = []
     self.num_updates = None
 
   def Run(self, _device, _root, _packages, _update, _deep, _deep_rev):
-    return self.pkgs, self.listed, self.num_updates
+    return self.cpvs, self.listed, self.num_updates
 
 
 class PortageTreeFake(object):
@@ -306,15 +307,15 @@
       return fname == _BINPKG
 
     packages = ['some/foo-1.2.3', _BINPKG, 'some/foobar-2.0']
-    self.package_scanner.return_value = PackageScannerFake(packages)
+    cpvs = ['some/foo-1.2.3', 'to/bar-1.2.5', 'some/foobar-2.0']
+    self.package_scanner.return_value = PackageScannerFake(packages, cpvs)
     self.PatchObject(os.path, 'isfile', side_effect=FakeIsFile)
 
     deploy.Deploy(None, ['package'], force=True, clean_binpkg=False)
 
     # Check that package names were correctly resolved into binary packages.
     self.get_packages_paths.assert_called_once_with(
-        [portage_util.SplitCPV(p) for p in packages if p != _BINPKG],
-        True, 'sysroot')
+        [portage_util.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)