commit 42251f9ad57eaaf7d2251bd092d98ffce046e284
author Michael Mortensen <mmortensen@google.com> Thu Nov 14 11:01:43 2019 -0700
committer Michael Mortensen <mmortensen@google.com> Fri Nov 15 14:57:57 2019 +0000
tree 44bdb2a8e53dbd9e4ea748ee5579968bd9a88272
parent fe24d1e38c44c7f2cecdd5dfb1dcf02fdeb86ee6

BuildAPI: Add remaining unit tests and mocks for Binhost Service.

Also did minor cleanup of existing unit tests.

BUG=chromium:1000849
TEST=run_tests

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

api/controller/binhost.py

diff --git a/api/controller/binhost.py b/api/controller/binhost.py
index c5b6784..0721649 100644
--- a/api/controller/binhost.py
+++ b/api/controller/binhost.py
@@ -56,7 +56,15 @@
     new_binhost.package_index = 'Packages'
 
 
-@faux.all_empty
+def _GetPrivatePrebuiltAclArgsResponse(_input_proto, output_proto, _config):
+  """Add fake acls to a successful response."""
+  new_arg = output_proto.args.add()
+  new_arg.arg = '-g'
+  new_arg.value = 'group1:READ'
+
+
+@faux.success(_GetPrivatePrebuiltAclArgsResponse)
+@faux.empty_error
 @validate.require('build_target.name')
 @validate.validation_complete
 def GetPrivatePrebuiltAclArgs(input_proto, output_proto, _config):
@@ -74,10 +82,17 @@
     new_arg.value = value
 
 
-@faux.all_empty
+def _PrepareBinhostUploadsResponse(_input_proto, output_proto, _config):
+  """Add fake binhost upload targets to a successful response."""
+  output_proto.uploads_dir = '/upload/directory'
+  output_proto.upload_targets.add().path = 'upload_target'
+
+
+@faux.success(_PrepareBinhostUploadsResponse)
+@faux.empty_error
 @validate.require('uri')
 def PrepareBinhostUploads(input_proto, output_proto, config):
-  """Return a list of files to uplooad to the binhost.
+  """Return a list of files to upload to the binhost.
 
   See BinhostService documentation in api/proto/binhost.proto.
 
@@ -128,7 +143,16 @@
     output_proto.upload_targets.add().path = upload_target.strip('/')
 
 
-@faux.all_empty
+def _PrepareDevInstallBinhostUploadsResponse(_input_proto, output_proto,
+                                             _config):
+  """Add fake binhost files to a successful response."""
+  output_proto.upload_targets.add().path = 'app-arch/zip-3.0-r3.tbz2'
+  output_proto.upload_targets.add().path = 'virtual/python-enum34-1.tbz2'
+  output_proto.upload_targets.add().path = 'Packages'
+
+
+@faux.success(_PrepareDevInstallBinhostUploadsResponse)
+@faux.empty_error
 @validate.require('uri', 'sysroot.path')
 @validate.exists('uploads_dir')
 def PrepareDevInstallBinhostUploads(input_proto, output_proto, config):
@@ -182,7 +206,13 @@
   output_proto.upload_targets.add().path = 'Packages'
 
 
-@faux.all_empty
+def _SetBinhostResponse(_input_proto, output_proto, _config):
+  """Add fake binhost file to a successful response."""
+  output_proto.output_file = '/path/to/BINHOST.conf'
+
+
+@faux.success(_SetBinhostResponse)
+@faux.empty_error
 @validate.require('build_target.name', 'key', 'uri')
 @validate.validation_complete
 def SetBinhost(input_proto, output_proto, _config):
@@ -204,7 +234,13 @@
                                                 private=private)
 
 
-@faux.all_empty
+def _RegenBuildCacheResponse(_input_proto, output_proto, _config):
+  """Add fake binhosts cache path to a successful response."""
+  output_proto.modified_overlays.add().path = '/path/to/BuildCache'
+
+
+@faux.success(_RegenBuildCacheResponse)
+@faux.empty_error
 @validate.require('overlay_type')
 @validate.is_in('overlay_type', _OVERLAY_TYPE_TO_NAME)
 @validate.validation_complete