Commit 8b8d567a authored by qyearsley's avatar qyearsley Committed by Commit bot

Quick spelling clean-up in the auto-bisect code.

Note: I prefer "try server" and "try bot" more than "tryserver" and "trybot" because that's what's used in the official documentation: http://dev.chromium.org/developers/testing/try-server-usage

BUG=

Review URL: https://codereview.chromium.org/468633005

Cr-Commit-Position: refs/heads/master@{#291579}
parent 0d938856
...@@ -85,7 +85,7 @@ REPO_PARAMS = [ ...@@ -85,7 +85,7 @@ REPO_PARAMS = [
def OutputAnnotationStepStart(name): def OutputAnnotationStepStart(name):
"""Outputs annotation to signal the start of a step to a trybot. """Outputs annotation to signal the start of a step to a try bot.
Args: Args:
name: The name of the step. name: The name of the step.
...@@ -99,7 +99,7 @@ def OutputAnnotationStepStart(name): ...@@ -99,7 +99,7 @@ def OutputAnnotationStepStart(name):
def OutputAnnotationStepClosed(): def OutputAnnotationStepClosed():
"""Outputs annotation to signal the closing of a step to a trybot.""" """Outputs annotation to signal the closing of a step to a try bot."""
print print
print '@@@STEP_CLOSED@@@' print '@@@STEP_CLOSED@@@'
print print
...@@ -111,7 +111,7 @@ def OutputAnnotationStepLink(label, url): ...@@ -111,7 +111,7 @@ def OutputAnnotationStepLink(label, url):
Args: Args:
label: The name to print. label: The name to print.
url: The url to print. url: The URL to print.
""" """
print print
print '@@@STEP_LINK@%s@%s@@@' % (label, url) print '@@@STEP_LINK@%s@%s@@@' % (label, url)
...@@ -172,10 +172,10 @@ def _CreateAndChangeToSourceDirectory(working_directory): ...@@ -172,10 +172,10 @@ def _CreateAndChangeToSourceDirectory(working_directory):
def _SubprocessCall(cmd, cwd=None): def _SubprocessCall(cmd, cwd=None):
"""Runs a subprocess with specified parameters. """Runs a command in a subprocess.
Args: Args:
params: A list of parameters to pass to gclient. cmd: The command to run.
cwd: Working directory to run from. cwd: Working directory to run from.
Returns: Returns:
......
...@@ -16,7 +16,7 @@ def TruncatedMean(data_set, truncate_percent): ...@@ -16,7 +16,7 @@ def TruncatedMean(data_set, truncate_percent):
Args: Args:
data_set: Non-empty list of values. data_set: Non-empty list of values.
truncate_percent: The % from the upper and lower portions of the data set truncate_percent: How much of the upper and lower portions of the data set
to discard, expressed as a value in [0, 1]. to discard, expressed as a value in [0, 1].
Returns: Returns:
......
...@@ -36,10 +36,10 @@ class SourceControl(object): ...@@ -36,10 +36,10 @@ class SourceControl(object):
def SyncToRevisionWithGClient(self, revision): def SyncToRevisionWithGClient(self, revision):
"""Uses gclient to sync to the specified revision. """Uses gclient to sync to the specified revision.
ie. gclient sync --revision <revision> This is like running gclient sync --revision <revision>.
Args: Args:
revision: The git SHA1 or svn CL (depending on workflow). revision: A git SHA1 hash or SVN revision number (depending on workflow).
Returns: Returns:
The return code of the call. The return code of the call.
...@@ -48,11 +48,11 @@ class SourceControl(object): ...@@ -48,11 +48,11 @@ class SourceControl(object):
'--delete_unversioned_trees', '--nohooks', '--revision', revision]) '--delete_unversioned_trees', '--nohooks', '--revision', revision])
def SyncToRevisionWithRepo(self, timestamp): def SyncToRevisionWithRepo(self, timestamp):
"""Uses repo to sync all the underlying git depots to the specified """Uses the repo command to sync all the underlying git depots to the
time. specified time.
Args: Args:
timestamp: The unix timestamp to sync to. timestamp: The Unix timestamp to sync to.
Returns: Returns:
The return code of the call. The return code of the call.
...@@ -227,6 +227,7 @@ class GitSourceControl(SourceControl): ...@@ -227,6 +227,7 @@ class GitSourceControl(SourceControl):
Args: Args:
revision: Revision you want to gather information on. revision: Revision you want to gather information on.
Returns: Returns:
A dict in the following format: A dict in the following format:
{ {
...@@ -259,7 +260,7 @@ class GitSourceControl(SourceControl): ...@@ -259,7 +260,7 @@ class GitSourceControl(SourceControl):
['checkout', revision, file_name], cwd=cwd)[1] ['checkout', revision, file_name], cwd=cwd)[1]
def RevertFileToHead(self, file_name): def RevertFileToHead(self, file_name):
"""Unstages a file and returns it to HEAD. """Un-stages a file and resets the file's state to HEAD.
Returns: Returns:
True if successful. True if successful.
......
This diff is collapsed.
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"""Prepare Performance Test Bisect Tool """Prepare Performance Test Bisect Tool
This script is used by a trybot to create a working directory and sync an This script is used by a try bot to create a working directory and sync an
initial copy of the depot for use in bisecting performance regressions. initial copy of the depot for use in bisecting performance regressions.
An example usage: An example usage:
...@@ -27,7 +27,7 @@ def main(): ...@@ -27,7 +27,7 @@ def main():
"""Does an initial checkout of Chromium then exits.""" """Does an initial checkout of Chromium then exits."""
usage = ('%prog [options] [-- chromium-options]\n' usage = ('%prog [options] [-- chromium-options]\n'
'Prepares a temporary depot for use on a trybot.') 'Prepares a temporary depot for use on a try bot.')
parser = optparse.OptionParser(usage=usage) parser = optparse.OptionParser(usage=usage)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"""Run Performance Test Bisect Tool """Run Performance Test Bisect Tool
This script is used by a trybot to run the src/tools/bisect-perf-regression.py This script is used by a try bot to run the src/tools/bisect-perf-regression.py
script with the parameters specified in run-bisect-perf-regression.cfg. It will script with the parameters specified in run-bisect-perf-regression.cfg. It will
check out a copy of the depot in a subdirectory 'bisect' of the working check out a copy of the depot in a subdirectory 'bisect' of the working
directory provided, and run the bisect-perf-regression.py script there. directory provided, and run the bisect-perf-regression.py script there.
...@@ -220,7 +220,7 @@ def _CreateBisectOptionsFromConfig(config): ...@@ -220,7 +220,7 @@ def _CreateBisectOptionsFromConfig(config):
opts_dict['cros_board'] = os.environ[CROS_BOARD_ENV] opts_dict['cros_board'] = os.environ[CROS_BOARD_ENV]
opts_dict['cros_remote_ip'] = os.environ[CROS_IP_ENV] opts_dict['cros_remote_ip'] = os.environ[CROS_IP_ENV]
else: else:
raise RuntimeError('Cros build selected, but BISECT_CROS_IP or' raise RuntimeError('CrOS build selected, but BISECT_CROS_IP or'
'BISECT_CROS_BOARD undefined.') 'BISECT_CROS_BOARD undefined.')
elif 'android' in config['command']: elif 'android' in config['command']:
if 'android-chrome-shell' in config['command']: if 'android-chrome-shell' in config['command']:
...@@ -271,7 +271,7 @@ def _RunPerformanceTest(config, path_to_file): ...@@ -271,7 +271,7 @@ def _RunPerformanceTest(config, path_to_file):
bisect_utils.OutputAnnotationStepStart('Reverting Patch') bisect_utils.OutputAnnotationStepStart('Reverting Patch')
# TODO: When this is re-written to recipes, this should use bot_update's # TODO: When this is re-written to recipes, this should use bot_update's
# revert mechanism to fully revert the client. But for now, since we know that # revert mechanism to fully revert the client. But for now, since we know that
# the perf trybot currently only supports src/ and src/third_party/WebKit, we # the perf try bot currently only supports src/ and src/third_party/WebKit, we
# simply reset those two directories. # simply reset those two directories.
bisect_utils.CheckRunGit(['reset', '--hard']) bisect_utils.CheckRunGit(['reset', '--hard'])
bisect_utils.CheckRunGit(['reset', '--hard'], bisect_utils.CheckRunGit(['reset', '--hard'],
...@@ -301,11 +301,11 @@ def _RunPerformanceTest(config, path_to_file): ...@@ -301,11 +301,11 @@ def _RunPerformanceTest(config, path_to_file):
if 'storage.googleapis.com/chromium-telemetry/html-results/' in t] if 'storage.googleapis.com/chromium-telemetry/html-results/' in t]
if cloud_file_link: if cloud_file_link:
# What we're getting here is basically "View online at http://..." so parse # What we're getting here is basically "View online at http://..." so parse
# out just the url portion. # out just the URL portion.
cloud_file_link = cloud_file_link[0] cloud_file_link = cloud_file_link[0]
cloud_file_link = [t for t in cloud_file_link.split(' ') cloud_file_link = [t for t in cloud_file_link.split(' ')
if 'storage.googleapis.com/chromium-telemetry/html-results/' in t] if 'storage.googleapis.com/chromium-telemetry/html-results/' in t]
assert cloud_file_link, "Couldn't parse url from output." assert cloud_file_link, 'Couldn\'t parse URL from output.'
cloud_file_link = cloud_file_link[0] cloud_file_link = cloud_file_link[0]
else: else:
cloud_file_link = '' cloud_file_link = ''
...@@ -442,8 +442,8 @@ def _RunBisectionScript( ...@@ -442,8 +442,8 @@ def _RunBisectionScript(
cmd.extend(['--extra_src', path_to_extra_src]) cmd.extend(['--extra_src', path_to_extra_src])
# These flags are used to download build archives from cloud storage if # These flags are used to download build archives from cloud storage if
# available, otherwise will post a try_job_http request to build it on # available, otherwise will post a try_job_http request to build it on the
# tryserver. # try server.
if config.get('gs_bucket'): if config.get('gs_bucket'):
if config.get('builder_host') and config.get('builder_port'): if config.get('builder_host') and config.get('builder_port'):
cmd.extend(['--gs_bucket', config['gs_bucket'], cmd.extend(['--gs_bucket', config['gs_bucket'],
...@@ -483,7 +483,7 @@ def _PrintConfigStep(config): ...@@ -483,7 +483,7 @@ def _PrintConfigStep(config):
def _OptionParser(): def _OptionParser():
"""Returns the options parser for run-bisect-perf-regression.py.""" """Returns the options parser for run-bisect-perf-regression.py."""
usage = ('%prog [options] [-- chromium-options]\n' usage = ('%prog [options] [-- chromium-options]\n'
'Used by a trybot to run the bisection script using the parameters' 'Used by a try bot to run the bisection script using the parameters'
' provided in the run-bisect-perf-regression.cfg file.') ' provided in the run-bisect-perf-regression.cfg file.')
parser = optparse.OptionParser(usage=usage) parser = optparse.OptionParser(usage=usage)
parser.add_option('-w', '--working_directory', parser.add_option('-w', '--working_directory',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment