commit b51a1f08b6d30096f8c3ec6454d5a8957e6475c3
author Michael Mortensen <mmortensen@google.com> Wed Oct 16 13:28:20 2019 -0600
committer Michael Mortensen <mmortensen@google.com> Wed Oct 16 20:50:26 2019 +0000
tree 30cefce5c54e1aae58c6c055f4c04cdc681fe394
parent 4283206673b92d011fb642a97615e21cbf8b56bf

Have determine_chrome_version use a build_target to match controller call.

BUG=chromium:1015064
TEST=manual, run_tests

Change-Id: Ic6c98ff129441ffe2bf6c289633041bfa9e6ee05
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1865528
Reviewed-by: Alex Klein <saklein@chromium.org>
Tested-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>

service/packages.py

diff --git a/service/packages.py b/service/packages.py
index 9a904cf..7852d18 100644
--- a/service/packages.py
+++ b/service/packages.py
@@ -435,13 +435,13 @@
   return any(atom in package for package in graph['package_deps'])
 
 
-def determine_chrome_version(board):
+def determine_chrome_version(build_target):
   """Returns the current Chrome version for the board (or in buildroot).
 
   Args:
-    board: The board name this is specific to.
+    build_target (build_target_util.BuildTarget): The board build target.
   """
-  cpv = portage_util.PortageqBestVisible(constants.CHROME_CP, board,
+  cpv = portage_util.PortageqBestVisible(constants.CHROME_CP, build_target.name,
                                          cwd=constants.SOURCE_ROOT)
   # Something like 78.0.3877.4_rc -> 78.0.3877.4
   return cpv.version_no_rev.partition('_')[0]

service/packages_unittest.py

diff --git a/service/packages_unittest.py b/service/packages_unittest.py
index 0d1b7be..425df19 100644
--- a/service/packages_unittest.py
+++ b/service/packages_unittest.py
@@ -135,7 +135,7 @@
 class ChromeVersionsTest(cros_test_lib.MockTestCase):
   """Tests getting chrome version."""
   def setUp(self):
-    self.board = 'board'
+    self.build_target = build_target_util.BuildTarget('board')
 
   def test_determine_chrome_version(self):
     # Mock PortageqBestVisible to return a valid chrome version string.
@@ -144,7 +144,7 @@
     self.PatchObject(portage_util, 'PortageqBestVisible',
                      return_value=r1_cpv)
 
-    chrome_version = packages.determine_chrome_version(self.board)
+    chrome_version = packages.determine_chrome_version(self.build_target)
     version_numbers = chrome_version.split('.')
     self.assertEqual(len(version_numbers), 4)
     self.assertEqual(int(version_numbers[0]), 78)