[crosutils] Add --quiet to cros_run_parallel_vm_tests

bin/cros_run_parallel_vm_tests.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Runs tests on VMs in parallel."""
 
 import optparse
 import os
 import subprocess
 import sys
 import tempfile
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '../lib'))
 from cros_build_lib import Die
 from cros_build_lib import Info
 
 
 _DEFAULT_BASE_SSH_PORT = 9222
 
 class ParallelTestRunner(object):
   """Runs tests on VMs in parallel.
 
   This class is a simple wrapper around cros_run_vm_test that provides an easy
   way to spawn several test instances in parallel and aggregate the results when
   the tests complete.
   """
 
   def __init__(self, tests, base_ssh_port=_DEFAULT_BASE_SSH_PORT, board=None,
-               image_path=None, order_output=False, results_dir_root=None,
-               use_emerged=False):
+               image_path=None, order_output=False, quiet=False,
+               results_dir_root=None, use_emerged=False):
     """Constructs and initializes the test runner class.
 
     Args:
       tests: A list of test names (see run_remote_tests.sh).
       base_ssh_port: The base SSH port. Spawned VMs listen to localhost SSH
         ports incrementally allocated starting from the base one.
       board: The target board. If none, cros_run_vm_tests will use the default
         board.
       image_path: Full path to the VM image. If none, cros_run_vm_tests will use
         the latest image.
       order_output: If True, output of individual VMs will be piped to
         temporary files and emitted at the end.
       results_dir_root: The results directory root. If provided, the results
         directory root for each test will be created under it with the SSH port
         appended to the test name.
+      use_emerged: Force use of emerged autotest packages.
     """
     self._tests = tests
     self._base_ssh_port = base_ssh_port
     self._board = board
     self._image_path = image_path
     self._order_output = order_output
+    self._quiet = quiet

[petkov, 2011/03/02 23:08:34]

document quiet too?

[Chris Masone, 2011/03/02 23:27:28]

Done.

     self._results_dir_root = results_dir_root
     self._use_emerged = use_emerged
 
   def _SpawnTests(self):
     """Spawns VMs and starts the test runs on them.
 
     Runs all tests in |self._tests|. Each test is executed on a separate VM.
 
     Returns:
       A list of test process info objects containing the following dictionary
       entries:
         'test': the test name;
         'proc': the Popen process instance for this test run.
     """
     ssh_port = self._base_ssh_port
     spawned_tests = []
     for test in self._tests:
       args = [ os.path.join(os.path.dirname(__file__), 'cros_run_vm_test'),
                '--snapshot',  # The image is shared so don't modify it.
                '--no_graphics',
                '--ssh_port=%d' % ssh_port ]
       if self._board: args.append('--board=%s' % self._board)
       if self._image_path: args.append('--image_path=%s' % self._image_path)
+      results_dir = '%s/%s.%d' % (self._results_dir_root, test, ssh_port)

[petkov, 2011/03/02 23:08:34]

subtle... it took me a while to think through the case. i guess this is OK as
is, although you might want to initialize results_dir to None here and set it to
the right value in the if body below.

[Chris Masone, 2011/03/02 23:27:28]

Done.

       if self._results_dir_root:
-        args.append('--results_dir_root=%s/%s.%d' %
-                    (self._results_dir_root, test, ssh_port))
+        args.append('--results_dir_root=%s' % results_dir)
       if self._use_emerged: args.append('--use_emerged')
       args.append(test)
       Info('Running %r...' % args)
       output = None
       if self._order_output:
         output = tempfile.NamedTemporaryFile(prefix='parallel_vm_test_')
         Info('Piping output to %s.' % output.name)
+      if self._quiet:

[petkov, 2011/03/02 23:08:34]

can you move this up and do "elif self._order_output"

I know order_output is forced to false but it will be even more clear that way,
I think.

[Chris Masone, 2011/03/02 23:27:28]

Done.

+        output = open('/dev/null', mode='w')
+        Info('Output is in %s' % results_dir)

[petkov, 2011/03/02 23:08:34]

You mean the log files are there?

[Chris Masone, 2011/03/02 23:27:28]

Yes.

       proc = subprocess.Popen(args, stdout=output, stderr=output)
       test_info = { 'test': test,
                     'proc': proc,
                     'output': output }
       spawned_tests.append(test_info)
       ssh_port = ssh_port + 1
     return spawned_tests
 
   def _WaitForCompletion(self, spawned_tests):
     """Waits for tests to complete and returns a list of failed tests.
 
     If the test output was piped to a file, dumps the file contents to stdout.
 
     Args:
       spawned_tests: A list of test info objects (see _SpawnTests).
 
     Returns:
       A list of failed test names.
     """
     failed_tests = []
     for test_info in spawned_tests:
       proc = test_info['proc']
       proc.wait()
       if proc.returncode: failed_tests.append(test_info['test'])
       output = test_info['output']
-      if output:
+      if output and not self._quiet:
         test = test_info['test']
         Info('------ START %s:%s ------' % (test, output.name))
         output.seek(0)
         for line in output:
           print line,
         Info('------ END %s:%s ------' % (test, output.name))
     return failed_tests
 
   def Run(self):
     """Runs the tests in |self._tests| on separate VMs in parallel."""
@@ skipping 13 matching lines @@
   parser.add_option('--board',
                     help='The target board. If none specified, '
                     'cros_run_vm_test will use the default board.')
   parser.add_option('--image_path',
                     help='Full path to the VM image. If none specified, '
                     'cros_run_vm_test will use the latest image.')
   parser.add_option('--order_output', action='store_true', default=False,
                     help='Rather than emitting interleaved progress output '
                     'from the individual VMs, accumulate the outputs in '
                     'temporary files and dump them at the end.')
+  parser.add_option('--quiet', action='store_true', default=False,
+                    help='Emits no output from the VMs.  Forces --order_output'
+                    'to be false, and requires specifying --results_dir_root')
   parser.add_option('--results_dir_root',
                     help='Root results directory. If none specified, each test '
                     'will store its results in a separate /tmp directory.')
   parser.add_option('--use_emerged', action='store_true', default=False,
                     help='Force use of emerged autotest packages')
   (options, args) = parser.parse_args()
 
   if not args:
     parser.print_help()
     Die('no tests provided')
 
+  if options.quiet:
+    options.order_output = False
+    if not options.results_dir_root:
+      Die('--quiet requires --results_dir_root')
   runner = ParallelTestRunner(args, options.base_ssh_port, options.board,
                               options.image_path, options.order_output,
-                              options.results_dir_root, options.use_emerged)
+                              options.quiet, options.results_dir_root,
+                              options.use_emerged)
   runner.Run()
 
 
 if __name__ == '__main__':
   main()