mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 07:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

[crosutils] Add --quiet to cros_run_parallel_vm_tests

Browse Source 
When running tests that generate huge amounts of output (like
desktopui_BrowserTest) it would be nice to suppress stdout and stderr
so that the buildbot logs aren't enormous.  Adding a --quiet flag that
requires the --results_dir_root flag ensures that we can trim the
output while still ensuring that the useful data is captured.

BUG=8544
TEST=run two tests in parallel with --quiet and --results_dir_root and see that the output is where you expect it

Change-Id: I25c7ad2bc1d017a30df0d1ad4604207443e711d7

Review URL: http://codereview.chromium.org/6602098
This commit is contained in:
Chris Masone 2011-03-02 16:37:23 -08:00
parent 6adf1a3458
commit 2eae7c239d
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bin/cros_run_parallel_vm_tests.py
View File

@ -27,8 +27,8 @@ class ParallelTestRunner(object):
""" """
def __init__(self, tests, base_ssh_port=_DEFAULT_BASE_SSH_PORT, board=None, def __init__(self, tests, base_ssh_port=_DEFAULT_BASE_SSH_PORT, board=None,
image_path=None, order_output=False, results_dir_root=None, image_path=None, order_output=False, quiet=False,
use_emerged=False): results_dir_root=None, use_emerged=False):
"""Constructs and initializes the test runner class. """Constructs and initializes the test runner class.
Args: Args:
@ -41,15 +41,19 @@ class ParallelTestRunner(object):
the latest image. the latest image.
order_output: If True, output of individual VMs will be piped to order_output: If True, output of individual VMs will be piped to
temporary files and emitted at the end. temporary files and emitted at the end.
quiet: Emits no output from the VMs. Forces --order_output to be false,
and requires specifying --results_dir_root
results_dir_root: The results directory root. If provided, the results 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 directory root for each test will be created under it with the SSH port
appended to the test name. appended to the test name.
use_emerged: Force use of emerged autotest packages.
""" """
self._tests = tests self._tests = tests
self._base_ssh_port = base_ssh_port self._base_ssh_port = base_ssh_port
self._board = board self._board = board
self._image_path = image_path self._image_path = image_path
self._order_output = order_output self._order_output = order_output
self._quiet = quiet
self._results_dir_root = results_dir_root self._results_dir_root = results_dir_root
self._use_emerged = use_emerged self._use_emerged = use_emerged
@ -73,14 +77,18 @@ class ParallelTestRunner(object):
'--ssh_port=%d' % ssh_port ] '--ssh_port=%d' % ssh_port ]
if self._board: args.append('--board=%s' % self._board) if self._board: args.append('--board=%s' % self._board)
if self._image_path: args.append('--image_path=%s' % self._image_path) if self._image_path: args.append('--image_path=%s' % self._image_path)
results_dir = None
if self._results_dir_root: if self._results_dir_root:
args.append('--results_dir_root=%s/%s.%d' % results_dir = '%s/%s.%d' % (self._results_dir_root, test, ssh_port)
(self._results_dir_root, test, ssh_port)) args.append('--results_dir_root=%s' % results_dir)
if self._use_emerged: args.append('--use_emerged') if self._use_emerged: args.append('--use_emerged')
args.append(test) args.append(test)
Info('Running %r...' % args) Info('Running %r...' % args)
output = None output = None
if self._order_output: if self._quiet:
output = open('/dev/null', mode='w')
Info('Log files are in %s' % results_dir)
elif self._order_output:
output = tempfile.NamedTemporaryFile(prefix='parallel_vm_test_') output = tempfile.NamedTemporaryFile(prefix='parallel_vm_test_')
Info('Piping output to %s.' % output.name) Info('Piping output to %s.' % output.name)
proc = subprocess.Popen(args, stdout=output, stderr=output) proc = subprocess.Popen(args, stdout=output, stderr=output)
@ -108,7 +116,7 @@ class ParallelTestRunner(object):
proc.wait() proc.wait()
if proc.returncode: failed_tests.append(test_info['test']) if proc.returncode: failed_tests.append(test_info['test'])
output = test_info['output'] output = test_info['output']
if output: if output and not self._quiet:
test = test_info['test'] test = test_info['test']
Info('------ START %s:%s ------' % (test, output.name)) Info('------ START %s:%s ------' % (test, output.name))
output.seek(0) output.seek(0)
@ -142,6 +150,9 @@ def main():
help='Rather than emitting interleaved progress output ' help='Rather than emitting interleaved progress output '
'from the individual VMs, accumulate the outputs in ' 'from the individual VMs, accumulate the outputs in '
'temporary files and dump them at the end.') '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', parser.add_option('--results_dir_root',
help='Root results directory. If none specified, each test ' help='Root results directory. If none specified, each test '
'will store its results in a separate /tmp directory.') 'will store its results in a separate /tmp directory.')
@ -153,9 +164,14 @@ def main():
parser.print_help() parser.print_help()
Die('no tests provided') 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, runner = ParallelTestRunner(args, options.base_ssh_port, options.board,
options.image_path, options.order_output, options.image_path, options.order_output,
options.results_dir_root, options.use_emerged) options.quiet, options.results_dir_root,
options.use_emerged)
runner.Run() runner.Run()