commit 3df9c76a49990d758076452ea8aef60da7916085
author Michael Mortensen <mmortensen@google.com> Wed Jun 19 07:50:09 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Jun 25 04:51:07 2019 +0000
tree e2a4a23f81b26c5396e8c9e72c1e2b064aca993e
parent ce76d1e960eb22a2f6de4d2bd8f43bbebf8f0feb

Build API: Refactor service/lib and commands.py to use artifacts.BundleFirmware

BUG=chromium:954300
TEST=manual, run_tests

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

api/controller/artifacts_unittest.py

diff --git a/api/controller/artifacts_unittest.py b/api/controller/artifacts_unittest.py
index f0740a1..211cea2 100644
--- a/api/controller/artifacts_unittest.py
+++ b/api/controller/artifacts_unittest.py
@@ -30,6 +30,9 @@
     self.input_proto.build_target.name = 'target'
     self.input_proto.output_dir = '/tmp/artifacts'
     self.output_proto = artifacts_pb2.BundleResponse()
+    self.sysroot_input_proto = artifacts_pb2.BundleRequest()
+    self.sysroot_input_proto.sysroot.path = '/tmp/sysroot'
+    self.sysroot_input_proto.output_dir = '/tmp/artifacts'
 
     self.PatchObject(constants, 'SOURCE_ROOT', new='/cros')
 
@@ -246,14 +249,12 @@
 
   def testBundleFirmware(self):
     """BundleFirmware calls cbuildbot/commands with correct args."""
-    build_firmware_archive = self.PatchObject(
-        commands, 'BuildFirmwareArchive', return_value='firmware.tar.gz')
-    artifacts.BundleFirmware(self.input_proto, self.output_proto)
+    self.PatchObject(artifacts_svc,
+                     'BuildFirmwareArchive', return_value='firmware.tar.gz')
+    artifacts.BundleFirmware(self.sysroot_input_proto, self.output_proto)
     self.assertEqual(
         [artifact.path for artifact in self.output_proto.artifacts],
         ['/tmp/artifacts/firmware.tar.gz'])
-    self.assertEqual(build_firmware_archive.call_args_list,
-                     [mock.call('/cros', 'target', '/tmp/artifacts')])
 
   def testBundleFirmwareNoLogs(self):
     """BundleFirmware dies when no firmware found."""