commit c2615b7727cb06aff20017c9d8567cff06e95cf4
author Michael Mortensen <mmortensen@google.com> Tue Oct 15 08:12:24 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Oct 16 03:02:01 2019 +0000
tree 920fe622472b485a7054709fdeaa06a10bba84f0
parent ac6afeb999e9691fb643819671c4e68d04375883

Add determine_chrome_version to GetTargetVersions.

BUG=chromium:1004438
TEST=manual, run_tests

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

api/controller/packages_unittest.py

diff --git a/api/controller/packages_unittest.py b/api/controller/packages_unittest.py
index f70845a..ea51a56 100644
--- a/api/controller/packages_unittest.py
+++ b/api/controller/packages_unittest.py
@@ -253,6 +253,8 @@
                                             'determine_android_branch')
     patch_target_version = self.PatchObject(packages_service,
                                             'determine_android_target')
+    chrome_version = self.PatchObject(packages_service,
+                                      'determine_chrome_version')
 
     request = self._GetRequest(board='betty')
     packages_controller.GetTargetVersions(request, self.response,
@@ -260,6 +262,7 @@
     patch_version.assert_not_called()
     patch_branch_version.assert_not_called()
     patch_target_version.assert_not_called()
+    chrome_version.assert_not_called()
 
   def testNoBuildTargetFails(self):
     """No build target argument should fail."""
@@ -269,6 +272,28 @@
       packages_controller.GetTargetVersions(request, self.response,
                                             self.api_config)
 
+  def testGetTargetVersions(self):
+    """Verify basic return values."""
+    chrome_version = '76.0.1.2'
+    self.PatchObject(packages_service, 'determine_chrome_version',
+                     return_value=chrome_version)
+    android_version = 'android_test_version'
+    self.PatchObject(packages_service, 'determine_android_version',
+                     return_value=android_version)
+    android_branch = 'android_test_branch'
+    self.PatchObject(packages_service, 'determine_android_branch',
+                     return_value=android_branch)
+    android_target = 'android_test_target'
+    self.PatchObject(packages_service, 'determine_android_target',
+                     return_value=android_target)
+    request = self._GetRequest(board='betty')
+    packages_controller.GetTargetVersions(request, self.response,
+                                          self.api_config)
+    self.assertEqual(self.response.android_version, android_version)
+    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)
+
 
 class HasChromePrebuiltTest(cros_test_lib.MockTestCase, ApiConfigMixin):
   """HasChromePrebuilt tests."""