Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1304)

Side by Side Diff: scripts/slave/recipe_modules/chromium/api.py

Issue 417883002: Support proper retrying of telemetry_unittests in recipes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge to r285585 Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium/steps.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 from slave import recipe_api 5 from slave import recipe_api
6 from slave import recipe_util 6 from slave import recipe_util
7 7
8 from . import builders 8 from . import builders
9 from . import steps 9 from . import steps
10 10
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 generate_json_file=True, 292 generate_json_file=True,
293 results_directory=results_directory, 293 results_directory=results_directory,
294 python_mode=True, 294 python_mode=True,
295 spawn_dbus=spawn_dbus, 295 spawn_dbus=spawn_dbus,
296 revision=revision, 296 revision=revision,
297 webkit_revision=webkit_revision, 297 webkit_revision=webkit_revision,
298 master_class_name=master_class_name, 298 master_class_name=master_class_name,
299 env=env, 299 env=env,
300 **kwargs) 300 **kwargs)
301 301
302 def run_telemetry_unittests(self, suffix=None, **kwargs): 302 def run_telemetry_unittests(self, suffix=None, cmd_args=None, **kwargs):
303 name = 'telemetry_unittests' 303 name = 'telemetry_unittests'
304 if suffix: 304 if suffix:
305 name += ' (%s)' % suffix 305 name += ' (%s)' % suffix
306 cmd_args = cmd_args or []
306 return self.runtest( 307 return self.runtest(
307 self.m.path['checkout'].join('tools', 'telemetry', 'run_tests'), 308 self.m.path['checkout'].join('tools', 'telemetry', 'run_tests'),
308 args=['--browser=%s' % self.c.build_config_fs.lower()], 309 args=['--browser=%s' % self.c.build_config_fs.lower()] + cmd_args,
309 annotate='gtest', 310 annotate='gtest',
310 name=name, 311 name=name,
311 test_type='telemetry_unittests', 312 test_type='telemetry_unittests',
312 python_mode=True, 313 python_mode=True,
313 xvfb=True, 314 xvfb=True,
314 **kwargs) 315 **kwargs)
315 316
316 def run_telemetry_perf_unittests(self, suffix=None, **kwargs): 317 def run_telemetry_perf_unittests(self, suffix=None, cmd_args=None, **kwargs):
317 name = 'telemetry_perf_unittests' 318 name = 'telemetry_perf_unittests'
318 if suffix: 319 if suffix:
319 name += ' (%s)' % suffix 320 name += ' (%s)' % suffix
321 cmd_args = cmd_args or []
320 return self.runtest( 322 return self.runtest(
321 self.m.path['checkout'].join('tools', 'perf', 'run_tests'), 323 self.m.path['checkout'].join('tools', 'perf', 'run_tests'),
322 args=['--browser=%s' % self.c.build_config_fs.lower()], 324 args=['--browser=%s' % self.c.build_config_fs.lower()] + cmd_args,
323 annotate='gtest', 325 annotate='gtest',
324 name=name, 326 name=name,
325 test_type='telemetry_perf_unittests', 327 test_type='telemetry_perf_unittests',
326 python_mode=True, 328 python_mode=True,
327 xvfb=True, 329 xvfb=True,
328 **kwargs) 330 **kwargs)
329 331
330 def runhooks(self, **kwargs): 332 def runhooks(self, **kwargs):
331 """Run the build-configuration hooks for chromium.""" 333 """Run the build-configuration hooks for chromium."""
332 env = kwargs.get('env', {}) 334 env = kwargs.get('env', {})
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 steps = [] 493 steps = []
492 if bot_type in ['tester', 'builder_tester'] and test_steps: 494 if bot_type in ['tester', 'builder_tester'] and test_steps:
493 if self.m.platform.is_win: 495 if self.m.platform.is_win:
494 steps.append(self.crash_handler()) 496 steps.append(self.crash_handler())
495 497
496 steps.extend(test_steps) 498 steps.extend(test_steps)
497 499
498 if self.m.platform.is_win: 500 if self.m.platform.is_win:
499 steps.append(self.process_dumps()) 501 steps.append(self.process_dumps())
500 return steps 502 return steps
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium/steps.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698