commit 2b2367291125b0ffb4c6ab836520307fe0c8a69d
author Alex Klein <saklein@chromium.org> Wed Jun 19 15:44:26 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Wed Jun 26 19:37:50 2019 +0000
tree fa203e45e4dea5fb93a356a67d9893d5b38fed06
parent 7bf0ecb40e23d6b6eec2aab01dfcec9fb5bb9a1f

Build API: Add validation decorators.

Simplify the easy proto validation tasks by providing decorators
that can handle the simple validation cases.

BUG=None
TEST=run_tests

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

api/controller/test.py

diff --git a/api/controller/test.py b/api/controller/test.py
index ddd09f2..70a3931 100644
--- a/api/controller/test.py
+++ b/api/controller/test.py
@@ -13,6 +13,7 @@
 import os
 
 from chromite.api import controller
+from chromite.api import validate
 from chromite.api.controller import controller_util
 from chromite.api.gen.chromite.api import test_pb2
 from chromite.lib import build_target_util
@@ -48,17 +49,13 @@
     return controller.RETURN_CODE_COMPLETED_UNSUCCESSFULLY
 
 
+@validate.require('build_target.name', 'result_path')
 def BuildTargetUnitTest(input_proto, output_proto):
   """Run a build target's ebuild unit tests."""
   # Required args.
   board = input_proto.build_target.name
   result_path = input_proto.result_path
 
-  if not board:
-    cros_build_lib.Die('build_target.name is required.')
-  if not result_path:
-    cros_build_lib.Die('result_path is required.')
-
   # Method flags.
   # An empty sysroot means build packages was not run. This is used for
   # certain boards that need to use prebuilts (e.g. grunt's unittest-only).
@@ -103,26 +100,21 @@
     return controller.RETURN_CODE_COMPLETED_UNSUCCESSFULLY
 
 
+@validate.require('build_target.name', 'vm_path.path', 'test_harness',
+                  'vm_tests')
 def VmTest(input_proto, _output_proto):
   """Run VM tests."""
-  if not input_proto.HasField('build_target'):
-    cros_build_lib.Die('build_target is required')
-  build_target = input_proto.build_target
-
-  vm_path = input_proto.vm_path
-  if not vm_path.path:
-    cros_build_lib.Die('vm_path.path is required.')
+  build_target_name = input_proto.build_target.name
+  vm_path = input_proto.vm_path.path
 
   test_harness = input_proto.test_harness
   if test_harness == test_pb2.VmTestRequest.UNSPECIFIED:
     cros_build_lib.Die('test_harness is required')
 
   vm_tests = input_proto.vm_tests
-  if not vm_tests:
-    cros_build_lib.Die('vm_tests must contain at least one element')
 
   cmd = ['cros_run_test', '--debug', '--no-display', '--copy-on-write',
-         '--board', build_target.name, '--image-path', vm_path.path,
+         '--board', build_target_name, '--image-path', vm_path,
          '--%s' % test_pb2.VmTestRequest.TestHarness.Name(test_harness).lower()]
   cmd.extend(vm_test.pattern for vm_test in vm_tests)