[recipes.py] move test arg parsing to its module

recipes.py

 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
@@ skipping 16 matching lines @@
 sys.path.insert(0, ROOT_DIR)
 
 from recipe_engine import env
 
 import argparse  # this is vendored
 from recipe_engine import arguments_pb2
 from recipe_engine import util as recipe_util
 from google.protobuf import json_format as jsonpb
 
 
-def test(config_file, package_deps, args):
-  try:
-    from recipe_engine import test
-  except ImportError:
-    logging.error(
-        'Error while importing testing libraries. You may be missing the pip'
-        ' package "coverage". Install it, or use the --use-bootstrap command'
-        ' line argument when calling into the recipe engine, which will install'
-        ' it for you.')
-    raise
-
-  from recipe_engine import loader
-  from recipe_engine import package
-
-  universe = loader.RecipeUniverse(package_deps, config_file)
-  universe_view = loader.UniverseView(universe, package_deps.root_package)
-
-  # Prevent flakiness caused by stale pyc files.
-  package.cleanup_pyc(package_deps.root_package.recipes_dir)
-
-  return test.main(
-      universe_view, raw_args=args.args,
-      engine_flags=args.operational_args.engine_flags)
-
-
 def handle_recipe_return(recipe_result, result_filename, stream_engine,
                          engine_flags):
   if engine_flags and engine_flags.use_result_proto:
     return new_handle_recipe_return(
         recipe_result, result_filename, stream_engine)
 
   if 'recipe_result' in recipe_result.result:
     result_string = json.dumps(
         recipe_result.result['recipe_result'], indent=2)
     if result_filename:
@@ skipping 254 matching lines @@
       '--disable-bootstrap', action='store_false', dest='use_bootstrap',
       help='Disables bootstrap (see --use-bootstrap)')
 
   def operational_args_type(value):
     with open(value) as fd:
       return jsonpb.ParseDict(json.load(fd), arguments_pb2.Arguments())
 
   parser.set_defaults(
     operational_args=arguments_pb2.Arguments(),
     bare_command=False,  # don't call postprocess_func, don't use package_deps
+    postprocess_func=lambda parser, args: None,
   )
 
   parser.add_argument(
       '--operational-args-path',
       dest='operational_args',
       type=operational_args_type,
       help='The path to an operational Arguments file. If provided, this file '
            'must contain a JSONPB-encoded Arguments protobuf message, and will '
            'be integrated into the runtime parameters.')
 
@@ skipping 12 matching lines @@
   return post_process_args
 
 
 def main():
   parser = argparse.ArgumentParser(
       description='Interact with the recipe system.')
 
   common_postprocess_func = add_common_args(parser)
 
   from recipe_engine import fetch, lint_test, bundle, depgraph, autoroll
-  from recipe_engine import remote, refs, doc
-  to_add = [fetch, lint_test, bundle, depgraph, autoroll, remote, refs, doc]
+  from recipe_engine import remote, refs, doc, test
+  to_add = [
+    fetch, lint_test, bundle, depgraph, autoroll, remote, refs, doc, test,
+  ]
 
   subp = parser.add_subparsers()
   for module in to_add:
     module.add_subparser(subp)
 
-  test_p = subp.add_parser(
-    'test',
-    description='Generate or check expectations by simulation')
-  test_p.set_defaults(command='test')
-  test_p.add_argument('args', nargs=argparse.REMAINDER)
-
 
   def properties_file_type(filename):
     with (sys.stdin if filename == '-' else open(filename)) as f:
       obj = json.load(f)
       if not isinstance(obj, dict):
         raise argparse.ArgumentTypeError(
           'must contain a JSON object, i.e. `{}`.')
       return obj
 
   def parse_prop(prop):
@@ skipping 53 matching lines @@
   run_p.add_argument(
       'props',
       nargs=argparse.REMAINDER,
       type=parse_prop,
       help='A list of property pairs; e.g. mastername=chromium.linux '
            'issue=12345. The property value will be decoded as JSON, but if '
            'this decoding fails the value will be interpreted as a string.')
 
   args = parser.parse_args()
   common_postprocess_func(parser, args)
-  if hasattr(args, 'postprocess_func'):
-    args.postprocess_func(parser, args)
+  args.postprocess_func(parser, args)
 
   # TODO(iannucci): We should always do logging.basicConfig() (probably with
   # logging.WARNING), even if no verbose is passed. However we need to be
   # careful as this could cause issues with spurious/unexpected output. I think
   # it's risky enough to do in a different CL.
 
   if args.verbose > 0:
     logging.basicConfig()
     logging.getLogger().setLevel(logging.INFO)
   if args.verbose > 1:
     logging.getLogger().setLevel(logging.DEBUG)
 
-  # Auto-enable bootstrap for test command invocations (necessary to get recent
-  # enough version of coverage package), unless explicitly disabled.
-  if args.command == 'test' and args.use_bootstrap is None:
-    args.use_bootstrap = True
-
   # If we're bootstrapping, construct our bootstrap environment. If we're
   # using a custom deps path, install our enviornment there too.
   if args.use_bootstrap and not env.USING_BOOTSTRAP:
     logging.debug('Bootstrapping recipe engine through vpython...')
 
     bootstrap_env = os.environ.copy()
     bootstrap_env[env.BOOTSTRAP_ENV_KEY] = '1'
 
     cmd = [
         sys.executable,
@@ skipping 35 matching lines @@
         repo_root, config_file, allow_fetch=not args.no_fetch,
         deps_path=args.deps_path, overrides=args.project_override)
   except subprocess.CalledProcessError:
     # A git checkout failed somewhere. Return 2, which is the sign that this is
     # an infra failure, rather than a test failure.
     return 2
 
   if hasattr(args, 'func'):
     return args.func(package_deps, args)
 
-  if args.command == 'test':
-    return test(config_file, package_deps, args)
-  elif args.command == 'run':
+  if args.command == 'run':
     return run(config_file, package_deps, args)
   else:
     print """Dear sir or madam,
         It has come to my attention that a quite impossible condition has come
     to pass in the specification you have issued a request for us to fulfill.
     It is with a heavy heart that I inform you that, at the present juncture,
     there is no conceivable next action to be taken upon your request, and as
     such, we have decided to abort the request with a nonzero status code.  We
     hope that your larger goals have not been put at risk due to this
     unfortunate circumstance, and wish you the best in deciding the next action
@@ skipping 20 matching lines @@
 
   if not isinstance(ret, int):
     if ret is None:
       ret = 0
     else:
       print >> sys.stderr, ret
       ret = 1
   sys.stdout.flush()
   sys.stderr.flush()
   os._exit(ret)