commit 568ec138fbbc3d967f8bf934b13007ad728bd1dd
author Michael Mortensen <mmortensen@google.com> Thu Jun 27 16:56:21 2019 +0000
committer Michael Mortensen <mmortensen@google.com> Thu Jun 27 21:40:26 2019 +0000
tree 5cd53780eb19beeabed2d5f65ed6bca5b2912de8
parent 62ba518265e5552471ee226d2cf99a12e8a38058

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

BUG=b:136134313
TEST=manual, run_tests

This reverts commit 3df9c76a49990d758076452ea8aef60da7916085.

Reason for revert: Causing failures for atlas (b/136134313)

Original change's description:
> 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>

Bug: chromium:954300
Change-Id: I8fde3807bf6fff767d90d11739cf01db47d5503b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1680449
Reviewed-by: Alex Klein <saklein@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Commit-Queue: Michael Mortensen <mmortensen@google.com>
Tested-by: 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 211cea2..f0740a1 100644
--- a/api/controller/artifacts_unittest.py
+++ b/api/controller/artifacts_unittest.py
@@ -30,9 +30,6 @@
     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')
 
@@ -249,12 +246,14 @@
 
   def testBundleFirmware(self):
     """BundleFirmware calls cbuildbot/commands with correct args."""
-    self.PatchObject(artifacts_svc,
-                     'BuildFirmwareArchive', return_value='firmware.tar.gz')
-    artifacts.BundleFirmware(self.sysroot_input_proto, self.output_proto)
+    build_firmware_archive = self.PatchObject(
+        commands, 'BuildFirmwareArchive', return_value='firmware.tar.gz')
+    artifacts.BundleFirmware(self.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."""