openstack
/
heat
Code Issues Proposed changes

Fix missing spaces in strings 

Where strings are continued across multiple lines, it's easy to miss a
space. This fixes several incorrect strings, cleans up some formatting
(don't line break inside a format specifier) and fixes typos.

Change-Id: Id781b16cad03c32973a67c02ad22ce4459c6d126
This commit is contained in:
Zane Bitter 2017-03-01 15:50:19 -05:00 committed by huangtianhua
parent cfbc624b75
commit 5392273af8
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resources/openstack/heat/resource_group.py
View File

@ -182,7 +182,7 @@ class ResourceGroup(stack_resource.StackResource):
"the 'refs' attribute. "
"Note this is destructive on update when specified; "
"even if the count is not being reduced, and once "
"a resource name is removed, it's name is never "
"a resource name is removed, its name is never "
"reused in subsequent updates."
),
default=[]

8
heat/engine/resources/openstack/trove/instance.py
View File

@ -405,10 +405,10 @@ class Instance(resource.Resource):
if instance.status != self.ACTIVE:
return False
LOG.info(_LI("Database instance %(database)s created (flavor:%("
"flavor)s,volume:%(volume)s, datastore:%("
"datastore_type)s, datastore_version:%("
"datastore_version)s)"),
LOG.info(_LI("Database instance %(database)s created "
"(flavor:%(flavor)s, volume:%(volume)s, "
"datastore:%(datastore_type)s, "
"datastore_version:%(datastore_version)s)"),
{'database': self._dbinstance_name(),
'flavor': self.flavor,
'volume': self.volume,

16
heat/tests/db/test_sqlalchemy_api.py
View File

@ -3661,8 +3661,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
def test_db_encrypt_decrypt_verbose_on(self):
info_logger = self.useFixture(
fixtures.FakeLogger(level=logging.INFO,
format="%(levelname)8s [%(name)s] %("
"message)s"))
format="%(levelname)8s [%(name)s] "
"%(message)s"))
ctx = utils.dummy_context()
template = self._create_template()
user_creds = create_user_creds(ctx)
@ -3684,8 +3684,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
info_logger2 = self.useFixture(
fixtures.FakeLogger(level=logging.INFO,
format="%(levelname)8s [%(name)s] %("
"message)s"))
format="%(levelname)8s [%(name)s] "
"%(message)s"))
db_api.db_decrypt_parameters_and_properties(
ctx, cfg.CONF.auth_encryption_key, verbose=True)
@ -3703,8 +3703,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
def test_db_encrypt_decrypt_verbose_off(self):
info_logger = self.useFixture(
fixtures.FakeLogger(level=logging.INFO,
format="%(levelname)8s [%(name)s] %("
"message)s"))
format="%(levelname)8s [%(name)s] "
"%(message)s"))
ctx = utils.dummy_context()
template = self._create_template()
user_creds = create_user_creds(ctx)
@ -3722,8 +3722,8 @@ class DBAPICryptParamsPropsTest(common.HeatTestCase):
info_logger2 = self.useFixture(
fixtures.FakeLogger(level=logging.INFO,
format="%(levelname)8s [%(name)s] %("
"message)s"))
format="%(levelname)8s [%(name)s] "
"%(message)s"))
db_api.db_decrypt_parameters_and_properties(
ctx, cfg.CONF.auth_encryption_key, verbose=False)

4
heat/tests/test_stack.py
View File

@ -2562,8 +2562,8 @@ class StackTest(common.HeatTestCase):
''')
warning_logger = self.useFixture(
fixtures.FakeLogger(level=logging.WARNING,
format="%(levelname)8s [%(name)s] %("
"message)s"))
format="%(levelname)8s [%(name)s] "
"%(message)s"))
cfg.CONF.set_override('encrypt_parameters_and_properties', False,
enforce_type=True)

4
heat/tests/test_stack_delete.py
View File

@ -433,8 +433,8 @@ class StackTest(common.HeatTestCase):
def test_delete_stack_with_resource_log_is_clear(self):
debug_logger = self.useFixture(
fixtures.FakeLogger(level=logging.DEBUG,
format="%(levelname)8s [%(name)s] %("
"message)s"))
format="%(levelname)8s [%(name)s] "
"%(message)s"))
tmpl = {'HeatTemplateFormatVersion': '2012-12-12',
'Resources': {'AResource': {'Type': 'GenericResourceType'}}}
self.stack = stack.Stack(self.ctx, 'delete_log_test',