Build API: Naming convention changes for clarity.
The overloading of API was needlessly confusing and promoted
incorrect usage. These changes fix the naming conventions so
they're more unique and their roles are clearer.
BUG=None
TEST=run_tests, precq
Change-Id: Iff1232b043d57861f48c6271ecc6df013fe21b54
Reviewed-on: https://chromium-review.googlesource.com/1491799
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/api/controller/image_unittest.py b/api/controller/image_unittest.py
new file mode 100644
index 0000000..d47a3bb
--- /dev/null
+++ b/api/controller/image_unittest.py
@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Image service tests."""
+
+from __future__ import print_function
+
+import mock
+import os
+
+from chromite.api.gen import image_pb2
+from chromite.api.controller import image as image_controller
+from chromite.lib import constants
+from chromite.lib import cros_test_lib
+from chromite.lib import osutils
+from chromite.service import image as image_service
+
+
+class CreateTest(cros_test_lib.MockTestCase):
+ """Create image tests."""
+
+ def testArgumentValidation(self):
+ """Test the argument validation."""
+ input_proto = image_pb2.CreateImageRequest()
+ output_proto = image_pb2.CreateImageResult()
+
+ # No board should cause it to fail.
+ with self.assertRaises(image_controller.InvalidArgumentError):
+ image_controller.Create(input_proto, output_proto)
+
+ def testImageTypeHandling(self):
+ """Test the image type handling."""
+ build_patch = self.PatchObject(image_service, 'Build', return_value=False)
+ input_proto = image_pb2.CreateImageRequest()
+ input_proto.build_target.name = 'board'
+ output_proto = image_pb2.CreateImageResult()
+
+ # Should default to the base image.
+ image_controller.Create(input_proto, output_proto)
+ build_patch.assert_called_with(images=[constants.IMAGE_TYPE_BASE],
+ board=u'board', config=mock.ANY)
+
+ # Should be using a value that's provided.
+ input_proto.image_types.append(image_pb2.Image.DEV)
+ image_controller.Create(input_proto, output_proto)
+ build_patch.assert_called_with(images=[constants.IMAGE_TYPE_DEV],
+ board=u'board', config=mock.ANY)
+
+ input_proto.image_types.append(image_pb2.Image.BASE)
+ input_proto.image_types.append(image_pb2.Image.TEST)
+ expected_images = [constants.IMAGE_TYPE_BASE, constants.IMAGE_TYPE_DEV,
+ constants.IMAGE_TYPE_TEST]
+ image_controller.Create(input_proto, output_proto)
+ build_patch.assert_called_with(images=expected_images, board=u'board',
+ config=mock.ANY)
+
+
+class ImageTest(cros_test_lib.MockTempDirTestCase):
+ """Image service tests."""
+
+ def setUp(self):
+ self.image_path = os.path.join(self.tempdir, 'image.bin')
+ self.board = 'board'
+ self.result_directory = os.path.join(self.tempdir, 'results')
+
+ osutils.SafeMakedirs(self.result_directory)
+ osutils.Touch(self.image_path)
+
+ def testTestArgumentValidation(self):
+ """Test function argument validation tests."""
+ self.PatchObject(image_service, 'Test', return_value=True)
+ input_proto = image_pb2.TestImageRequest()
+ output_proto = image_pb2.TestImageResult()
+
+ # Nothing provided.
+ with self.assertRaises(image_controller.InvalidArgumentError):
+ image_controller.Test(input_proto, output_proto)
+
+ # Just one argument.
+ input_proto.build_target.name = self.board
+ with self.assertRaises(image_controller.InvalidArgumentError):
+ image_controller.Test(input_proto, output_proto)
+
+ # Two arguments provided.
+ input_proto.result.directory = self.result_directory
+ with self.assertRaises(image_controller.InvalidArgumentError):
+ image_controller.Test(input_proto, output_proto)
+
+ # Invalid image path.
+ input_proto.image.path = '/invalid/image/path'
+ with self.assertRaises(image_controller.InvalidArgumentError):
+ image_controller.Test(input_proto, output_proto)
+
+ # All valid arguments.
+ input_proto.image.path = self.image_path
+ image_controller.Test(input_proto, output_proto)
+
+ def testTestOutputHandling(self):
+ """Test function output tests."""
+ input_proto = image_pb2.TestImageRequest()
+ input_proto.image.path = self.image_path
+ input_proto.build_target.name = self.board
+ input_proto.result.directory = self.result_directory
+ output_proto = image_pb2.TestImageResult()
+
+ self.PatchObject(image_service, 'Test', return_value=True)
+ image_controller.Test(input_proto, output_proto)
+ self.assertTrue(output_proto.success)
+
+ self.PatchObject(image_service, 'Test', return_value=False)
+ image_controller.Test(input_proto, output_proto)
+ self.assertFalse(output_proto.success)