commit 9fdb14b94056dfeeda68c3a9afbdece693ac9150
author Michael Mortensen <mmortensen@google.com> Thu Oct 17 11:17:30 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Thu Oct 17 23:39:23 2019 +0000
tree 902d185dbb67e2c61e30ad61989116ac1a5ee3cf
parent dc386fab66fc31948b24f676196e2cfbdcb4eade

Handle platform_version in packages.GetTargetVersions.

BUG=chromium:1004438
TEST=manual, run_tests

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

api/controller/packages.py

diff --git a/api/controller/packages.py b/api/controller/packages.py
index d5d58f0..f25c896 100644
--- a/api/controller/packages.py
+++ b/api/controller/packages.py
@@ -129,6 +129,7 @@
   if android_target_version:
     output_proto.android_target_version = android_target_version
   output_proto.chrome_version = packages.determine_chrome_version(build_target)
+  output_proto.platform_version = packages.determine_platform_version()
   # TODO(crbug.com/1004438): Implement remaining version fields.
 
 

api/controller/packages_unittest.py

diff --git a/api/controller/packages_unittest.py b/api/controller/packages_unittest.py
index 09e64c5..fe1f99b 100644
--- a/api/controller/packages_unittest.py
+++ b/api/controller/packages_unittest.py
@@ -286,6 +286,9 @@
     android_target = 'android_test_target'
     self.PatchObject(packages_service, 'determine_android_target',
                      return_value=android_target)
+    platform_version = '12345.1.2'
+    self.PatchObject(packages_service, 'determine_platform_version',
+                     return_value=platform_version)
     request = self._GetRequest(board='betty')
     packages_controller.GetTargetVersions(request, self.response,
                                           self.api_config)
@@ -293,12 +296,16 @@
     self.assertEqual(self.response.android_branch_version, android_branch)
     self.assertEqual(self.response.android_target_version, android_target)
     self.assertEqual(self.response.chrome_version, chrome_version)
+    self.assertEqual(self.response.platform_version, platform_version)
 
   def testGetTargetVersionNoAndroid(self):
     """Verify return values on a board that does not have android."""
     chrome_version = '76.0.1.2'
     self.PatchObject(packages_service, 'determine_chrome_version',
                      return_value=chrome_version)
+    platform_version = '12345.1.2'
+    self.PatchObject(packages_service, 'determine_platform_version',
+                     return_value=platform_version)
     self.PatchObject(packages_service, 'determine_android_version',
                      return_value=None)
     self.PatchObject(packages_service, 'determine_android_branch',
@@ -312,6 +319,7 @@
     self.assertFalse(self.response.android_version)
     self.assertFalse(self.response.android_branch_version)
     self.assertFalse(self.response.android_target_version)
+    self.assertEqual(self.response.platform_version, platform_version)
 
 class HasChromePrebuiltTest(cros_test_lib.MockTestCase, ApiConfigMixin):
   """HasChromePrebuilt tests."""