Merge pull request #16597 from dongjoon-hyun/fix_typos_in_devtools

Fix typos in error messages and comments of dev_tools module.
This commit is contained in:
Nik Everett 2016-02-11 09:28:24 -05:00
commit b77175ec2d
5 changed files with 9 additions and 9 deletions

View File

@ -22,11 +22,11 @@
# build_randomization.rb [-d] [-l|t]
#
# DESCRIPTION
# This script takes the randomization choices described in RANDOM_CHOICE and generates apporpriate JAVA property file 'prop.txt'
# This script takes the randomization choices described in RANDOM_CHOICE and generates appropriate JAVA property file 'prop.txt'
# This property file also contain the appropriate JDK selection, randomized. JDK randomization is based on what is available on the Jenkins tools
# directory. This script is used by Jenkins test system to conduct Elasticsearch server randomization testing.
#
# In hash RANDOM_CHOISES, the key of randomization hash maps to key of java property. The value of the hash describes the possible value of the randomization
# In hash RANDOM_CHOICES, the key of randomization hash maps to key of java property. The value of the hash describes the possible value of the randomization
#
# For example RANDOM_CHOICES = { 'es.node.mode' => {:choices => ['local', 'network'], :method => :get_random_one} } means
# es.node.mode will be set to either 'local' or 'network', each with 50% of probability
@ -36,7 +36,7 @@
#
# -d, --debug Increase logging verbosity for debugging purpose
# -t, --test Run in test mode. The script will execute unit tests.
# -l, --local Run in local mode. In this mode, directory structure will be created under current directory to mimick
# -l, --local Run in local mode. In this mode, directory structure will be created under current directory to mimic
# Jenkins' server directory layout. This mode is mainly used for development.
require 'enumerator'
require 'getoptlong'
@ -70,7 +70,7 @@ C = {:local => false, :test => false}
OptionParser.new do |opts|
opts.banner = "Usage: build_ranodimzatin.rb [options]"
opts.banner = "Usage: build_randomization.rb [options]"
opts.on("-d", "--debug", "Debug mode") do |d|
L.level = DEBUG

View File

@ -260,7 +260,7 @@ if __name__ == "__main__":
parser.add_argument('--check', dest='check', action='store_true',
help='Checks and reports for all requirements and then exits')
# by default, we only run mvn install and dont push anything repo
# by default, we only run mvn install and don't push anything repo
parser.set_defaults(deploy_sonatype=False)
parser.set_defaults(deploy_s3=False)
parser.set_defaults(deploy_s3_repos=False)

View File

@ -223,7 +223,7 @@ def smoke_test_release(release, files, expected_hash, plugins):
node_plugins = node['plugins']
for node_plugin in node_plugins:
if not plugin_names.get(node_plugin['name'].strip(), False):
raise RuntimeError('Unexpeced plugin %s' % node_plugin['name'])
raise RuntimeError('Unexpected plugin %s' % node_plugin['name'])
del plugin_names[node_plugin['name']]
if plugin_names:
raise RuntimeError('Plugins not loaded %s' % list(plugin_names.keys()))

View File

@ -37,7 +37,7 @@ except ImportError as e:
'''This file executes a basic upgrade test by running a full cluster restart.
The upgrade test starts 2 or more nodes of an old elasticserach version, indexes
The upgrade test starts 2 or more nodes of an old elasticsearch version, indexes
a random number of documents into the running nodes and executes a full cluster restart.
After the nodes are recovered a small set of basic checks are executed to ensure all
documents are still searchable and field data can be loaded etc.

View File

@ -77,7 +77,7 @@ if __name__ == "__main__":
for root, dirs, files in os.walk(localMavenRepo):
for file in files:
# no metadata files (they get renamed from maven-metadata-local.xml to maven-metadata.xml while deploying)
# no .properties and .repositories files (they dont get uploaded)
# no .properties and .repositories files (they don't get uploaded)
if not file.startswith('maven-metadata') and not file.endswith('.properties') and not file.endswith('.repositories'):
filesToCheck.append(os.path.join(root, file))
if file.endswith('.asc'):
@ -123,7 +123,7 @@ if __name__ == "__main__":
print
if len(errors) != 0:
print 'The following errors occured (%s out of %s files)' % (len(errors), len(filesToCheck))
print 'The following errors occurred (%s out of %s files)' % (len(errors), len(filesToCheck))
print
for error in errors:
print error