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

[crosutils] Remove --use_emerged from cros_run_parallel_vm_tests

Browse Source 
cros_run_parallel_vm_tests doesn't work unless you pass --use_emerged; there must be some underlying issue with trying to perform multiple run_remote_tests commands at the same time, even on different VMs.  So, remove the option and force --use_emerged on the calls to cros_run_vm_test.

BUG=8544
TEST=run two tests in parallel with cros_run_parallel_vm_tests and see that they both complete.

Change-Id: I1152ca3dd7f1de37261da894b9b903c90c2e6524

Review URL: http://codereview.chromium.org/6612058
This commit is contained in:
Chris Masone 2011-03-09 17:09:06 -08:00
parent cc0c062a3d
commit 6530f1bec8
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/cros_run_parallel_vm_tests.py
View File

@ -23,12 +23,13 @@ class ParallelTestRunner(object):
This class is a simple wrapper around cros_run_vm_test that provides an easy 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 way to spawn several test instances in parallel and aggregate the results when
the tests complete. the tests complete. Only uses emerged autotest packaged, as trying to pull
from the caller's source tree creates races that cause tests to fail.
""" """
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, quiet=False, image_path=None, order_output=False, quiet=False,
results_dir_root=None, use_emerged=False): results_dir_root=None):
"""Constructs and initializes the test runner class. """Constructs and initializes the test runner class.
Args: Args:
@ -46,7 +47,6 @@ class ParallelTestRunner(object):
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
@ -55,7 +55,6 @@ class ParallelTestRunner(object):
self._order_output = order_output self._order_output = order_output
self._quiet = quiet self._quiet = quiet
self._results_dir_root = results_dir_root self._results_dir_root = results_dir_root
self._use_emerged = use_emerged
def _SpawnTests(self): def _SpawnTests(self):
"""Spawns VMs and starts the test runs on them. """Spawns VMs and starts the test runs on them.
@ -74,6 +73,7 @@ class ParallelTestRunner(object):
args = [ os.path.join(os.path.dirname(__file__), 'cros_run_vm_test'), args = [ os.path.join(os.path.dirname(__file__), 'cros_run_vm_test'),
'--snapshot', # The image is shared so don't modify it. '--snapshot', # The image is shared so don't modify it.
'--no_graphics', '--no_graphics',
'--use_emerged',
'--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)
@ -81,7 +81,6 @@ class ParallelTestRunner(object):
if self._results_dir_root: if self._results_dir_root:
results_dir = '%s/%s.%d' % (self._results_dir_root, test, ssh_port) results_dir = '%s/%s.%d' % (self._results_dir_root, test, ssh_port)
args.append('--results_dir_root=%s' % results_dir) args.append('--results_dir_root=%s' % results_dir)
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
@ -156,8 +155,6 @@ def main():
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.')
parser.add_option('--use_emerged', action='store_true', default=False,
help='Force use of emerged autotest packages')
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if not args: if not args:
@ -170,8 +167,7 @@ def main():
Die('--quiet requires --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.quiet, options.results_dir_root, options.quiet, options.results_dir_root)
options.use_emerged)
runner.Run() runner.Run()