commit 4579e8c78566b326800ee3551f7e3f012cfd86f9
author LaMont Jones <lamontjones@chromium.org> Fri Dec 06 14:20:37 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Dec 12 05:43:25 2019 +0000
tree 1aebc13596971bd3e6470d9a34558adf77e15042
parent 9490eb70c8daa975361c2b83f37e5bbae3a1613b

toolchain: Update proto, add toolchain endpoints.

This adds sufficient support to begin calling the endpoints, which still
need work.

BUG=chromium:1019868
TEST=unit tests pass

Change-Id: I8b9a20791bf42ac59fee767277586ce251fd1ee8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1963118
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>

api/controller/toolchain_unittest.py

diff --git a/api/controller/toolchain_unittest.py b/api/controller/toolchain_unittest.py
index 0d024d1..b2801c5 100644
--- a/api/controller/toolchain_unittest.py
+++ b/api/controller/toolchain_unittest.py
@@ -9,8 +9,10 @@
 
 from chromite.api import api_config
 from chromite.api.controller import toolchain
+from chromite.api.gen.chromite.api import sysroot_pb2
 from chromite.api.gen.chromite.api import toolchain_pb2
 from chromite.api.gen.chromiumos.builder_config_pb2 import BuilderConfig
+from chromite.api.gen.chromiumos import common_pb2
 
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_lib
@@ -169,7 +171,7 @@
     self.command.assert_called_once_with('chrome_afdo', self.board)
 
 
-class PrepareForBuildTest(cros_test_lib.MockTestCase,
+class PrepareForBuildTest(cros_test_lib.MockTempDirTestCase,
                           api_config.ApiConfigMixin):
   """Unittests for PrepareForBuild."""
 
@@ -179,8 +181,12 @@
   def _GetRequest(self, artifact_types=None):
     if artifact_types is None:
       artifact_types = []
+    chroot = common_pb2.Chroot(path=self.tempdir)
+    sysroot = sysroot_pb2.Sysroot(
+        path='/build/board', build_target=common_pb2.BuildTarget(name='board'))
     return toolchain_pb2.PrepareForToolchainBuildRequest(
         artifact_types=artifact_types,
+        chroot=chroot, sysroot=sysroot,
     )
 
   def testReturnsUnknownForUnknown(self):
@@ -198,9 +204,13 @@
     self.response = toolchain_pb2.BundleToolchainResponse()
 
   def _GetRequest(self, artifact_types=None):
+    chroot = common_pb2.Chroot(path=self.tempdir)
+    sysroot = sysroot_pb2.Sysroot(
+        path='/build/board', build_target=common_pb2.BuildTarget(name='board'))
     return toolchain_pb2.BundleToolchainRequest(
-        artifact_types=artifact_types,
+        chroot=chroot, sysroot=sysroot,
         output_dir=self.tempdir,
+        artifact_types=artifact_types,
     )
 
   def testReturnsUnknownForUnknown(self):