commit cb541e87ab3a2faf89a66d3467ebe7ddd66e572a
author Alex Klein <saklein@chromium.org> Wed Jun 26 15:06:11 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Jul 02 23:19:18 2019 +0000
tree d35e7273397fcf89643c5622b4cab2f6cba03791
parent 1e0fe2308050188d75e20873d55f32d3aa1e4e38

BundleTestUpdatePayloads: Refactor to service.

BUG=chromium:954283
TEST=run_tests, manually ran endpoint.

Change-Id: I78da1164acb3b8d048fd202e4c9e50c1dbd73b43
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1679378
Tested-by: Alex Klein <saklein@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>
Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>

api/controller/artifacts_unittest.py

diff --git a/api/controller/artifacts_unittest.py b/api/controller/artifacts_unittest.py
index f0740a1..d4e5631 100644
--- a/api/controller/artifacts_unittest.py
+++ b/api/controller/artifacts_unittest.py
@@ -305,20 +305,14 @@
 
     self.PatchObject(constants, 'SOURCE_ROOT', new=self.source_root)
 
-    def MockGeneratePayloads(image_path, archive_dir, **kwargs):
-      assert kwargs
-      osutils.WriteFile(os.path.join(archive_dir, 'payload.bin'), image_path)
+    def MockPayloads(image_path, archive_dir):
+      osutils.WriteFile(os.path.join(archive_dir, 'payload1.bin'), image_path)
+      osutils.WriteFile(os.path.join(archive_dir, 'payload2.bin'), image_path)
+      return [os.path.join(archive_dir, 'payload1.bin'),
+              os.path.join(archive_dir, 'payload2.bin')]
 
-    self.generate_payloads = self.PatchObject(
-        commands, 'GeneratePayloads', side_effect=MockGeneratePayloads)
-
-    def MockGenerateQuickProvisionPayloads(image_path, archive_dir):
-      osutils.WriteFile(os.path.join(archive_dir, 'payload-qp.bin'), image_path)
-
-    self.generate_quick_provision_payloads = self.PatchObject(
-        commands,
-        'GenerateQuickProvisionPayloads',
-        side_effect=MockGenerateQuickProvisionPayloads)
+    self.bundle_patch = self.PatchObject(
+        artifacts_svc, 'BundleTestUpdatePayloads', side_effect=MockPayloads)
 
   def testBundleTestUpdatePayloads(self):
     """BundleTestUpdatePayloads calls cbuildbot/commands with correct args."""
@@ -331,7 +325,7 @@
         os.path.relpath(artifact.path, self.archive_root)
         for artifact in self.output_proto.artifacts
     ]
-    expected = ['payload.bin', 'payload-qp.bin']
+    expected = ['payload1.bin', 'payload2.bin']
     self.assertItemsEqual(actual, expected)
 
     actual = [
@@ -340,13 +334,6 @@
     ]
     self.assertItemsEqual(actual, expected)
 
-    self.assertEqual(self.generate_payloads.call_args_list, [
-        mock.call(image_path, mock.ANY, full=True, stateful=True, delta=True),
-    ])
-
-    self.assertEqual(self.generate_quick_provision_payloads.call_args_list,
-                     [mock.call(image_path, mock.ANY)])
-
   def testBundleTestUpdatePayloadsNoImageDir(self):
     """BundleTestUpdatePayloads dies if no image dir is found."""
     # Intentionally do not write image directory.