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

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

Issue 2170903002: Set nest step status when test failure for Chromedriver recipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromedriver/example.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 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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 recipe_engine import recipe_api 5 from recipe_engine import recipe_api
6 6
7 GS_CHROMEDRIVER_DATA_BUCKET = 'chromedriver-data' 7 GS_CHROMEDRIVER_DATA_BUCKET = 'chromedriver-data'
8 GS_PREBUILTS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/prebuilts' 8 GS_PREBUILTS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/prebuilts'
9 GS_SERVER_LOGS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/server_logs' 9 GS_SERVER_LOGS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/server_logs'
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 cmd.extend(['--verbose']) 124 cmd.extend(['--verbose'])
125 if self.m.platform.is_linux: 125 if self.m.platform.is_linux:
126 cmd = ['xvfb-run', '-a'] + cmd 126 cmd = ['xvfb-run', '-a'] + cmd
127 if android_package: 127 if android_package:
128 cmd.extend(['--android-package', android_package]) 128 cmd.extend(['--android-package', android_package])
129 return cmd 129 return cmd
130 130
131 def _run_test(self, test_name, script_path, chromedriver, 131 def _run_test(self, test_name, script_path, chromedriver,
132 ref_chromedriver=None, android_package=None, verbose=False, 132 ref_chromedriver=None, android_package=None, verbose=False,
133 archive_server_log=True, **kwargs): 133 archive_server_log=True, **kwargs):
134 with self.m.step.nest(test_name): 134 with self.m.step.nest(test_name) as nest_step:
135 with self.m.tempfile.temp_dir('server_log') as server_log_dir: 135 with self.m.tempfile.temp_dir('server_log') as server_log_dir:
136 build_number = self.m.properties['buildnumber'] 136 build_number = self.m.properties['buildnumber']
137 server_log = server_log_dir.join( 137 server_log = server_log_dir.join(
138 ('%s_%s' % (test_name, build_number)).replace(' ', '_')) 138 ('%s_%s' % (test_name, build_number)).replace(' ', '_'))
139 139 try:
140 self.m.step('Run test %s' % test_name, 140 self.m.step('Run Tests',
141 self._generate_test_command( 141 self._generate_test_command(
142 script_path, chromedriver, server_log, 142 script_path, chromedriver, server_log,
143 ref_chromedriver=ref_chromedriver, 143 ref_chromedriver=ref_chromedriver,
144 android_package=android_package, 144 android_package=android_package,
145 verbose=verbose), 145 verbose=verbose),
146 **kwargs) 146 **kwargs)
147 if archive_server_log: 147 except self.m.step.StepFailure:
148 self.archive_server_log(server_log) 148 nest_step.presentation.status = self.m.step.FAILURE
149 raise
150 finally:
151 if archive_server_log:
152 self.archive_server_log(server_log)
149 153
150 def run_python_tests(self, chromedriver, ref_chromedriver, 154 def run_python_tests(self, chromedriver, ref_chromedriver,
151 chrome_version_name=None, android_package=None, 155 chrome_version_name=None, android_package=None,
152 archive_server_log=True, **kwargs): 156 archive_server_log=True, **kwargs):
153 """Run the Chromedriver Python tests.""" 157 """Run the Chromedriver Python tests."""
154 test_name = 'python_tests%s' % ( 158 test_name = 'python_tests%s' % (
155 ' %s' % chrome_version_name if chrome_version_name else '') 159 ' %s' % chrome_version_name if chrome_version_name else '')
156 test_script_path = self.m.path['checkout'].join( 160 test_script_path = self.m.path['checkout'].join(
157 'chrome', 'test', 'chromedriver', 'test', 'run_py_tests.py') 161 'chrome', 'test', 'chromedriver', 'test', 'run_py_tests.py')
158 self._run_test(test_name, test_script_path, chromedriver, 162 self._run_test(test_name, test_script_path, chromedriver,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 chrome_version_name=package, 205 chrome_version_name=package,
202 android_package=package, 206 android_package=package,
203 env=test_env, 207 env=test_env,
204 archive_server_log=archive_server_logs) 208 archive_server_log=archive_server_logs)
205 self.run_java_tests(chromedriver, 209 self.run_java_tests(chromedriver,
206 chrome_version_name=package, 210 chrome_version_name=package,
207 android_package=package, 211 android_package=package,
208 verbose=True, 212 verbose=True,
209 env=test_env, 213 env=test_env,
210 archive_server_log=archive_server_logs) 214 archive_server_log=archive_server_logs)
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromedriver/example.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698