add basic bootstrap for coverage

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 200 matching lines @@
 def info(args):
   from recipe_engine import package
   repo_root, config_file = get_package_config(args)
   package_spec = package.PackageSpec.load_proto(config_file)
 
   if args.recipes_dir:
     print package_spec.recipes_path
 
 
 def main():
+  sysargs = sys.argv

[Paweł Hajdan Jr., 2016/06/15 10:56:19]

What's the intention of this code?

It doesn't seem to copy original contents.

Please either name it e.g. original_sys_argv and make a copy, or remove it and
use sys.argv.

[martiniss, 2016/06/15 20:36:53]

I moved this to where we mutate sys.argv, and made it make a copy.

   from recipe_engine import package
 
   # Super-annoyingly, we need to manually parse for simulation_test since
   # argparse is bonkers and doesn't allow us to forward --help to subcommands.
   if 'simulation_test' in sys.argv:
     index = sys.argv.index('simulation_test')
     sys.argv = sys.argv[:index+1] + [json.dumps(sys.argv[index+1:])]
 
   parser = argparse.ArgumentParser(
       description='Interact with the recipe system.')
@@ skipping 11 matching lines @@
   # TODO(phajdan.jr): Figure out if we need --no-fetch; remove if not.
   parser.add_argument(
       '--no-fetch', action='store_true',
       help='Disable automatic fetching')
   parser.add_argument(
       '--bootstrap-script',
       help='Path to the script used to bootstrap this tool (internal use only)')
   parser.add_argument('-O', '--project-override', metavar='ID=PATH',
       action=ProjectOverrideAction,
       help='Override a project repository path with a local one.')
+  parser.add_argument(
+      '--use-bootstrap', action='store_true',
+      help='Use bootstrap/bootstrap.py to create a isolated python virtualenv'
+           ' with required python dependencies.')
 
   subp = parser.add_subparsers()
 
   fetch_p = subp.add_parser(
       'fetch',
       description='Fetch and update dependencies.')
   fetch_p.set_defaults(command='fetch')
 
   simulation_test_p = subp.add_parser(
     'simulation_test',
@@ skipping 107 matching lines @@
   info_p = subp.add_parser(
       'info',
       description='Query information about the current recipe package')
   info_p.set_defaults(command='info')
   info_p.add_argument(
       '--recipes-dir', action='store_true',
       help='Get the subpath where the recipes live relative to repository root')
 
   args = parser.parse_args()
 
+  if args.use_bootstrap:
+    subprocess.check_call(
+        ['bootstrap/bootstrap.py', '--deps-file', 'bootstrap/deps.pyl', 'ENV'],

[Paweł Hajdan Jr., 2016/06/15 10:56:19]

nit: Start with sys.executable .

[martiniss, 2016/06/15 20:36:53]

Done.

+        cwd=os.path.dirname(os.path.realpath(__file__)))
+
+    args = [arg for arg in sysargs[1:] if 'use-bootstrap' not in arg]

[Paweł Hajdan Jr., 2016/06/15 10:56:19]

nit: This might interfere with other legitimate args which might happen to
contain use-bootstrap (e.g. a build property).

Is there some other way we could use to prevent infinite loop here, e.g. an
environment variable similar to how we do for update_scripts, or a
--no-bootstrap flag that overrides any --use-bootstrap flags?

[martiniss, 2016/06/15 20:36:53]

I used an environment variable, like update scripts.

+    return subprocess.call(
+        ['ENV/bin/python', 'recipes.py'] + args,
+        cwd=os.path.dirname(os.path.realpath(__file__)))
+
   if args.verbose:
     logging.getLogger().setLevel(logging.INFO)
 
   # Commands which do not require config_file, package_deps, and other objects
   # initialized later.
   if args.command == 'remote_run':
     return remote_run(args)
 
   repo_root, config_file = get_package_config(args)
 
@@ skipping 54 matching lines @@
   ret = main()
   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)