commit 009cb668c9b4057aad3a8adccaacefdf8b14a3ab
author Michael Mortensen <mmortensen@google.com> Mon Oct 21 11:38:43 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Oct 22 17:17:14 2019 +0000
tree 3acbbfe9a6658ca714819c274a773b2bf247aadf
parent 8017a6a7fc260ec47bbf2b7fac188bc30afc6c6e

Handle milestone_version and full_version in packages.GetTargetVersions.

BUG=chromium:1004438
TEST=manual, run_tests

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

api/controller/packages_unittest.py

diff --git a/api/controller/packages_unittest.py b/api/controller/packages_unittest.py
index 1a6504e..7fb1b06 100644
--- a/api/controller/packages_unittest.py
+++ b/api/controller/packages_unittest.py
@@ -257,6 +257,12 @@
                                             'determine_android_target')
     chrome_version = self.PatchObject(packages_service,
                                       'determine_chrome_version')
+    platform_version = self.PatchObject(packages_service,
+                                        'determine_platform_version')
+    milestone_version = self.PatchObject(packages_service,
+                                         'determine_milestone_version')
+    full_version = self.PatchObject(packages_service,
+                                    'determine_full_version')
 
     request = self._GetRequest(board='betty')
     packages_controller.GetTargetVersions(request, self.response,
@@ -266,6 +272,9 @@
     patch_target_version.assert_not_called()
     builds_chrome.assert_not_called()
     chrome_version.assert_not_called()
+    platform_version.assert_not_called()
+    milestone_version.assert_not_called()
+    full_version.assert_not_called()
 
   def testNoBuildTargetFails(self):
     """No build target argument should fail."""
@@ -294,6 +303,12 @@
     platform_version = '12345.1.2'
     self.PatchObject(packages_service, 'determine_platform_version',
                      return_value=platform_version)
+    milestone_version = '79'
+    self.PatchObject(packages_service, 'determine_milestone_version',
+                     return_value=milestone_version)
+    full_version = 'R79-12345.1.2'
+    self.PatchObject(packages_service, 'determine_full_version',
+                     return_value=full_version)
     request = self._GetRequest(board='betty')
     packages_controller.GetTargetVersions(request, self.response,
                                           self.api_config)
@@ -302,6 +317,8 @@
     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)
+    self.assertEqual(self.response.milestone_version, milestone_version)
+    self.assertEqual(self.response.full_version, full_version)
 
   def testGetTargetVersionNoAndroidNoChrome(self):
     """Verify return values on a board that does not have android."""