openstack/cinder
Code Issues Proposed changes

Merge "Fix common misspellings"

Browse Source
This commit is contained in:
Jenkins 2015-05-11 20:03:52 +00:00 committed by Gerrit Code Review
commit 86b384ca2e
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/consistencygroup/api.py
View File

@ -453,7 +453,7 @@ class API(base.Base):
fields = {'updated_at': now}
# Update name and description in db now. No need to
# to send them over thru an RPC call.
# to send them over through an RPC call.
if name:
fields['name'] = name
if description:

2
cinder/objects/base.py
View File

@ -613,7 +613,7 @@ class CinderObjectDictCompat(object):
if key not in self.obj_fields:
# NOTE(jdg): There are a number of places where we rely on the
# old dictionary version and do a get(xxx, None).
# The following preserves that compatability but in
# The following preserves that compatibility but in
# the future we'll remove this shim altogether so don't
# rely on it.
LOG.debug('Cinder object %(object_name)s has no '

4
cinder/tests/unit/targets/test_tgt_driver.py
View File

@ -328,7 +328,7 @@ class TestTgtAdmDriver(test.TestCase):
raise putils.ProcessExecutionError(
exit_code=1,
stdout='',
stderr='this isnt the error your looking for',
stderr='this is not the error you are looking for',
cmd='tgt-admin --force --delete')
mock_exec.side_effect = _fake_execute
@ -373,7 +373,7 @@ class TestTgtAdmDriver(test.TestCase):
raise putils.ProcessExecutionError(
exit_code=1,
stdout='',
stderr='this isnt the error your looking for',
stderr='this is not the error you are looking for',
cmd='tgt-admin --force --delete')
mock_exec.side_effect = _fake_execute

2
cinder/tests/unit/test_srb.py
View File

@ -585,7 +585,7 @@ class SRBDriverTestCase(test.TestCase):
lvname = cmd[4].split('/')[1]
snapname = cmd[2]
if lvname not in self._volumes[vgname]['vgs'][vgname]['lvs']:
raise AssertionError('snap creation attempted on non-existant '
raise AssertionError('snap creation attempted on non-existent '
'thin-lv: %s' % cmd_string)
if snapname[1:] in self._volumes[vgname]['vgs'][vgname]['snaps']:
raise AssertionError('snap creation attempted on existing '

4
cinder/volume/drivers/emc/emc_vmax_utils.py
View File

@ -1533,7 +1533,7 @@ class EMCVMAXUtils(object):
if six.text_type(poolName) == six.text_type(poolnameStr):
try:
# Check that pool hasnt suddently been deleted.
# Check that pool hasn't suddenly been deleted.
srpPoolInstance = conn.GetInstance(srpPoolInstanceName)
propertiesList = srpPoolInstance.properties.items()
for properties in propertiesList:
@ -1591,7 +1591,7 @@ class EMCVMAXUtils(object):
poolInstanceId)
if poolnameStr is not None and systemNameStr is not None:
if six.text_type(poolNameInStr) == six.text_type(poolnameStr):
# check that the pool hasnt recently been deleted.
# check that the pool hasn't recently been deleted.
try:
conn.GetInstance(vpoolInstanceName)
foundPoolInstanceName = vpoolInstanceName

2
cinder/volume/drivers/ibm/storwize_svc/helpers.py
View File

@ -946,7 +946,7 @@ class StorwizeHelpers(object):
"""Ensures that vdisk is not part of FC mapping and deletes it."""
LOG.debug('enter: delete_vdisk: vdisk %s' % vdisk)
if not self.is_vdisk_defined(vdisk):
LOG.info(_LI('Tried to delete non-existant vdisk %s.') % vdisk)
LOG.info(_LI('Tried to delete non-existent vdisk %s.') % vdisk)
return
self.ensure_vdisk_no_fc_mappings(vdisk)
self.ssh.rmvdisk(vdisk, force=force)

2
pylintrc
View File

@ -16,7 +16,7 @@ variable-rgx=[a-z_][a-z0-9_]{0,30}$
argument-rgx=[a-z_][a-z0-9_]{1,30}$
# Method names should be at least 3 characters long
# and be lowecased with underscores
# and be lowercased with underscores
method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$
# Module names matching cinder-* are ok (files in bin/)